svn commit: trunk/busybox/shell

landley at busybox.net landley at busybox.net
Thu Aug 10 21:46:43 UTC 2006


Author: landley
Date: 2006-08-10 14:46:43 -0700 (Thu, 10 Aug 2006)
New Revision: 15800

Log:
Make a warning go away when standalone shell is disabled.


Modified:
   trunk/busybox/shell/msh.c


Changeset:
Modified: trunk/busybox/shell/msh.c
===================================================================
--- trunk/busybox/shell/msh.c	2006-08-10 21:00:23 UTC (rev 15799)
+++ trunk/busybox/shell/msh.c	2006-08-10 21:46:43 UTC (rev 15800)
@@ -3126,18 +3126,17 @@
 	int i;
 	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);
+	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);
+		}
 	}
-#endif
 
 	DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp));
 




More information about the busybox-cvs mailing list