aboutsummaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-04-10 23:03:30 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-04-10 23:03:30 +0000
commit80d14beae9ebe64d3be1e6c2771f292977cf6d2c (patch)
treed0dd803ca8b6c70521895fd5ec71ef532861b8e4 /shell/ash.c
parent89054964443b5cb14cba673b86306f534810404a (diff)
downloadbusybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.gz
busybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.bz2
busybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.zip
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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/ash.c b/shell/ash.c
index b4278424a..bebfec8f5 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6531,7 +6531,7 @@ tryexec(char *cmd, char **argv, char **envp)
6531{ 6531{
6532 int repeated = 0; 6532 int repeated = 0;
6533 6533
6534#if ENABLE_FEATURE_SH_STANDALONE_SHELL 6534#if ENABLE_FEATURE_SH_STANDALONE
6535 if (strchr(cmd, '/') == NULL) { 6535 if (strchr(cmd, '/') == NULL) {
6536 const struct bb_applet *a; 6536 const struct bb_applet *a;
6537 6537
@@ -6596,7 +6596,7 @@ shellexec(char **argv, const char *path, int idx)
6596 clearredir(1); 6596 clearredir(1);
6597 envp = environment(); 6597 envp = environment();
6598 if (strchr(argv[0], '/') 6598 if (strchr(argv[0], '/')
6599#if ENABLE_FEATURE_SH_STANDALONE_SHELL 6599#if ENABLE_FEATURE_SH_STANDALONE
6600 || find_applet_by_name(argv[0]) 6600 || find_applet_by_name(argv[0])
6601#endif 6601#endif
6602 ) { 6602 ) {
@@ -11116,7 +11116,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
11116 return; 11116 return;
11117 } 11117 }
11118 11118
11119#if ENABLE_FEATURE_SH_STANDALONE_SHELL 11119#if ENABLE_FEATURE_SH_STANDALONE
11120 if (find_applet_by_name(name)) { 11120 if (find_applet_by_name(name)) {
11121 entry->cmdtype = CMDNORMAL; 11121 entry->cmdtype = CMDNORMAL;
11122 entry->u.index = -1; 11122 entry->u.index = -1;
@@ -11341,7 +11341,7 @@ helpcmd(int argc, char **argv)
11341 col = 0; 11341 col = 0;
11342 } 11342 }
11343 } 11343 }
11344#if ENABLE_FEATURE_SH_STANDALONE_SHELL 11344#if ENABLE_FEATURE_SH_STANDALONE
11345 for (i = 0; i < NUM_APPLETS; i++) { 11345 for (i = 0; i < NUM_APPLETS; i++) {
11346 col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), applets[i].name); 11346 col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), applets[i].name);
11347 if (col > 60) { 11347 if (col > 60) {