diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-08-10 21:46:43 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-08-10 21:46:43 +0000 |
commit | dc51c220218fc9fef6c6f2e13ed8236636faf3d9 (patch) | |
tree | dd988607265cf5679a3e5d377e31eb2d58f3d03a | |
parent | d2f4370d6ab0fc1b69c0794de4b3e016206a96ae (diff) | |
download | busybox-w32-dc51c220218fc9fef6c6f2e13ed8236636faf3d9.tar.gz busybox-w32-dc51c220218fc9fef6c6f2e13ed8236636faf3d9.tar.bz2 busybox-w32-dc51c220218fc9fef6c6f2e13ed8236636faf3d9.zip |
Make a warning go away when standalone shell is disabled.
git-svn-id: svn://busybox.net/trunk/busybox@15800 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | shell/msh.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/shell/msh.c b/shell/msh.c index b491a08a4..df6f321aa 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
@@ -3126,18 +3126,17 @@ static char *rexecve(char *c, char **v, char **envp) | |||
3126 | int i; | 3126 | int i; |
3127 | char *sp, *tp; | 3127 | char *sp, *tp; |
3128 | int eacces = 0, asis = 0; | 3128 | int eacces = 0, asis = 0; |
3129 | |||
3130 | #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL | ||
3131 | char *name = c; | 3129 | char *name = c; |
3132 | 3130 | ||
3133 | optind = 1; | 3131 | if (ENABLE_FEATURE_SH_STANDALONE_SHELL) { |
3134 | if (find_applet_by_name(name)) { | 3132 | optind = 1; |
3135 | /* We have to exec here since we vforked. Running | 3133 | if (find_applet_by_name(name)) { |
3136 | * run_applet_by_name() won't work and bad things | 3134 | /* We have to exec here since we vforked. Running |
3137 | * will happen. */ | 3135 | * run_applet_by_name() won't work and bad things |
3138 | execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp); | 3136 | * will happen. */ |
3137 | execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp); | ||
3138 | } | ||
3139 | } | 3139 | } |
3140 | #endif | ||
3141 | 3140 | ||
3142 | DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp)); | 3141 | DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp)); |
3143 | 3142 | ||