diff options
| author | Denis Vlasenko | 2007-04-10 23:03:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-04-10 23:03:30 +0000 |
| commit | 80d14beae9ebe64d3be1e6c2771f292977cf6d2c (patch) | |
| tree | d0dd803ca8b6c70521895fd5ec71ef532861b8e4 /shell/ash.c | |
| parent | 89054964443b5cb14cba673b86306f534810404a (diff) | |
| download | busybox-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.zip busybox-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.gz | |
Rename two config options:
FEATURE_SH_STANDALONE_SHELL => FEATURE_SH_STANDALONE
FEATURE_EXEC_PREFER_APPLETS => FEATURE_PREFER_APPLETS
Make SH_STANDALONE depend on PREFER_APPLETS.
getopt.c: more randomconfig-induced fixes
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/ash.c b/shell/ash.c index b427842..bebfec8 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -6531,7 +6531,7 @@ tryexec(char *cmd, char **argv, char **envp) { int repeated = 0; -#if ENABLE_FEATURE_SH_STANDALONE_SHELL +#if ENABLE_FEATURE_SH_STANDALONE if (strchr(cmd, '/') == NULL) { const struct bb_applet *a; @@ -6596,7 +6596,7 @@ shellexec(char **argv, const char *path, int idx) clearredir(1); envp = environment(); if (strchr(argv[0], '/') -#if ENABLE_FEATURE_SH_STANDALONE_SHELL +#if ENABLE_FEATURE_SH_STANDALONE || find_applet_by_name(argv[0]) #endif ) { @@ -11116,7 +11116,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) return; } -#if ENABLE_FEATURE_SH_STANDALONE_SHELL +#if ENABLE_FEATURE_SH_STANDALONE if (find_applet_by_name(name)) { entry->cmdtype = CMDNORMAL; entry->u.index = -1; @@ -11341,7 +11341,7 @@ helpcmd(int argc, char **argv) col = 0; } } -#if ENABLE_FEATURE_SH_STANDALONE_SHELL +#if ENABLE_FEATURE_SH_STANDALONE for (i = 0; i < NUM_APPLETS; i++) { col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), applets[i].name); if (col > 60) { |