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/msh.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/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 23a7c04..0337a4f 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -37,7 +37,7 @@ # define DEFAULT_SHELL "/proc/self/exe" # define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe" # define BB_BANNER "busybox standalone" -# define ENABLE_FEATURE_SH_STANDALONE_SHELL 0 +# define ENABLE_FEATURE_SH_STANDALONE 0 # define bb_msg_memory_exhausted "memory exhausted" # define xmalloc(size) malloc(size) # define msh_main(argc,argv) main(argc,argv) @@ -3064,7 +3064,7 @@ static const char *rexecve(char *c, char **v, char **envp) int eacces = 0, asis = 0; char *name = c; - if (ENABLE_FEATURE_SH_STANDALONE_SHELL) { + if (ENABLE_FEATURE_SH_STANDALONE) { optind = 1; if (find_applet_by_name(name)) { /* We have to exec here since we vforked. Running @@ -3195,7 +3195,7 @@ static int dohelp(struct op *t) } x++; } -#if ENABLE_FEATURE_SH_STANDALONE_SHELL +#if ENABLE_FEATURE_SH_STANDALONE { const struct bb_applet *applet = applets; |