Changeset 904 in MondoRescue for trunk/mindi-busybox/shell/msh.c

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

File:

• trunk/mindi-busybox/shell/msh.c (modified) (1 diff)

trunk/mindi-busybox/shell/msh.c

@@ -3215 +3215 @@
     REGISTER char *sp, *tp;
     int eacces = 0, asis = 0;
-
-#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
     char *name = c;
 
-    optind = 1;
-    if (find_applet_by_name(name)) {
-        /* We have to exec here since we vforked.  Running
-         * run_applet_by_name() won't work and bad things
-         * will happen. */
-        execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
-    }
-#endif
+    if (ENABLE_FEATURE_SH_STANDALONE_SHELL) {
+        optind = 1;
+        if (find_applet_by_name(name)) {
+            /* We have to exec here since we vforked.  Running
+             * run_applet_by_name() won't work and bad things
+             * will happen. */
+            execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
+        }
+    }
 
     DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp));