svn commit: trunk/busybox: applets include

vda at busybox.net vda at busybox.net
Sat Mar 24 16:13:34 UTC 2007


Author: vda
Date: 2007-03-24 09:13:33 -0700 (Sat, 24 Mar 2007)
New Revision: 18230

Log:
#ifdef out re_execed on MMU machines


Modified:
   trunk/busybox/applets/busybox.c
   trunk/busybox/include/libbb.h


Changeset:
Modified: trunk/busybox/applets/busybox.c
===================================================================
--- trunk/busybox/applets/busybox.c	2007-03-24 16:06:46 UTC (rev 18229)
+++ trunk/busybox/applets/busybox.c	2007-03-24 16:13:33 UTC (rev 18230)
@@ -7,7 +7,9 @@
 #include "busybox.h"
 
 const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
+#ifdef BB_NOMMU
 smallint re_execed;
+#endif
 
 #ifdef CONFIG_FEATURE_INSTALLER
 /*
@@ -60,11 +62,13 @@
 {
 	const char *s;
 
+#ifdef BB_NOMMU
 	/* NOMMU re-exec trick sets high-order bit in first byte of name */
 	if (argv[0][0] & 0x80) {
 		re_execed = 1;
 		argv[0][0] &= 0x7f;
 	}
+#endif
 
 	applet_name = argv[0];
 	if (*applet_name == '-')

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2007-03-24 16:06:46 UTC (rev 18229)
+++ trunk/busybox/include/libbb.h	2007-03-24 16:13:33 UTC (rev 18230)
@@ -617,6 +617,7 @@
 extern void print_login_prompt(void);
 #ifdef BB_NOMMU
 extern void vfork_daemon_rexec(int nochdir, int noclose, char **argv);
+extern smallint re_execed;
 #endif
 extern int get_terminal_width_height(const int fd, int *width, int *height);
 
@@ -761,7 +762,6 @@
 };
 
 #define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c")
-extern smallint re_execed;
 extern const char *applet_name;
 extern const char BB_BANNER[];
 




More information about the busybox-cvs mailing list