diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-04-10 23:03:30 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-04-10 23:03:30 +0000 |
| commit | af0dfd1b9fbb1ba8ccba9f220018e6819180149e (patch) | |
| tree | d0dd803ca8b6c70521895fd5ec71ef532861b8e4 /shell/msh.c | |
| parent | ca47f469046173726e352cef459929bd27d132bd (diff) | |
| download | busybox-w32-af0dfd1b9fbb1ba8ccba9f220018e6819180149e.tar.gz busybox-w32-af0dfd1b9fbb1ba8ccba9f220018e6819180149e.tar.bz2 busybox-w32-af0dfd1b9fbb1ba8ccba9f220018e6819180149e.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
git-svn-id: svn://busybox.net/trunk/busybox@18394 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell/msh.c')
| -rw-r--r-- | shell/msh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/msh.c b/shell/msh.c index 23a7c0498..0337a4f06 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | # define DEFAULT_SHELL "/proc/self/exe" | 37 | # define DEFAULT_SHELL "/proc/self/exe" |
| 38 | # define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe" | 38 | # define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe" |
| 39 | # define BB_BANNER "busybox standalone" | 39 | # define BB_BANNER "busybox standalone" |
| 40 | # define ENABLE_FEATURE_SH_STANDALONE_SHELL 0 | 40 | # define ENABLE_FEATURE_SH_STANDALONE 0 |
| 41 | # define bb_msg_memory_exhausted "memory exhausted" | 41 | # define bb_msg_memory_exhausted "memory exhausted" |
| 42 | # define xmalloc(size) malloc(size) | 42 | # define xmalloc(size) malloc(size) |
| 43 | # define msh_main(argc,argv) main(argc,argv) | 43 | # define msh_main(argc,argv) main(argc,argv) |
| @@ -3064,7 +3064,7 @@ static const char *rexecve(char *c, char **v, char **envp) | |||
| 3064 | int eacces = 0, asis = 0; | 3064 | int eacces = 0, asis = 0; |
| 3065 | char *name = c; | 3065 | char *name = c; |
| 3066 | 3066 | ||
| 3067 | if (ENABLE_FEATURE_SH_STANDALONE_SHELL) { | 3067 | if (ENABLE_FEATURE_SH_STANDALONE) { |
| 3068 | optind = 1; | 3068 | optind = 1; |
| 3069 | if (find_applet_by_name(name)) { | 3069 | if (find_applet_by_name(name)) { |
| 3070 | /* We have to exec here since we vforked. Running | 3070 | /* We have to exec here since we vforked. Running |
| @@ -3195,7 +3195,7 @@ static int dohelp(struct op *t) | |||
| 3195 | } | 3195 | } |
| 3196 | x++; | 3196 | x++; |
| 3197 | } | 3197 | } |
| 3198 | #if ENABLE_FEATURE_SH_STANDALONE_SHELL | 3198 | #if ENABLE_FEATURE_SH_STANDALONE |
| 3199 | { | 3199 | { |
| 3200 | const struct bb_applet *applet = applets; | 3200 | const struct bb_applet *applet = applets; |
| 3201 | 3201 | ||