svn commit: trunk/busybox: libbb shell/ash_test shell/ash_test/ash- etc...

vda at busybox.net vda at busybox.net
Mon Oct 20 07:52:33 UTC 2008


Author: vda
Date: 2008-10-20 00:52:33 -0700 (Mon, 20 Oct 2008)
New Revision: 23731

Log:
ash: fix a bug in standalone mode (corrupted getopt() state)



Added:
   trunk/busybox/shell/ash_test/ash-standalone/
   trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.right
   trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.tests

Modified:
   trunk/busybox/libbb/getopt32.c
   trunk/busybox/libbb/vfork_daemon_rexec.c
   trunk/busybox/util-linux/getopt.c


Changeset:
Modified: trunk/busybox/libbb/getopt32.c
===================================================================
--- trunk/busybox/libbb/getopt32.c	2008-10-20 07:30:03 UTC (rev 23730)
+++ trunk/busybox/libbb/getopt32.c	2008-10-20 07:52:33 UTC (rev 23731)
@@ -515,28 +515,6 @@
 		}
 	}
 
-	/* In case getopt32 was already called:
-	 * reset the libc getopt() function, which keeps internal state.
-	 *
-	 * BSD-derived getopt() functions require that optind be set to 1 in
-	 * order to reset getopt() state.  This used to be generally accepted
-	 * way of resetting getopt().  However, glibc's getopt()
-	 * has additional getopt() state beyond optind, and requires that
-	 * optind be set to zero to reset its state.  So the unfortunate state of
-	 * affairs is that BSD-derived versions of getopt() misbehave if
-	 * optind is set to 0 in order to reset getopt(), and glibc's getopt()
-	 * will core dump if optind is set 1 in order to reset getopt().
-	 *
-	 * More modern versions of BSD require that optreset be set to 1 in
-	 * order to reset getopt().   Sigh.  Standards, anyone?
-	 */
-#ifdef __GLIBC__
-	optind = 0;
-#else /* BSD style */
-	optind = 1;
-	/* optreset = 1; */
-#endif
-	/* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
 	pargv = NULL;
 
 	/* Note: just "getopt() <= 0" will not work well for

Modified: trunk/busybox/libbb/vfork_daemon_rexec.c
===================================================================
--- trunk/busybox/libbb/vfork_daemon_rexec.c	2008-10-20 07:30:03 UTC (rev 23730)
+++ trunk/busybox/libbb/vfork_daemon_rexec.c	2008-10-20 07:52:33 UTC (rev 23731)
@@ -125,6 +125,7 @@
 	int rc, argc;
 
 	applet_name = APPLET_NAME(applet_no);
+
 	xfunc_error_retval = EXIT_FAILURE;
 
 	/* Special flag for xfunc_die(). If xfunc will "die"
@@ -132,7 +133,30 @@
 	 * die_sleep and longjmp here instead. */
 	die_sleep = -1;
 
-	/* option_mask32 = 0; - not needed */
+	/* In case getopt() or getopt32() was already called:
+	 * reset the libc getopt() function, which keeps internal state.
+	 *
+	 * BSD-derived getopt() functions require that optind be set to 1 in
+	 * order to reset getopt() state.  This used to be generally accepted
+	 * way of resetting getopt().  However, glibc's getopt()
+	 * has additional getopt() state beyond optind, and requires that
+	 * optind be set to zero to reset its state.  So the unfortunate state of
+	 * affairs is that BSD-derived versions of getopt() misbehave if
+	 * optind is set to 0 in order to reset getopt(), and glibc's getopt()
+	 * will core dump if optind is set 1 in order to reset getopt().
+	 *
+	 * More modern versions of BSD require that optreset be set to 1 in
+	 * order to reset getopt().  Sigh.  Standards, anyone?
+	 */
+#ifdef __GLIBC__
+	optind = 0;
+#else /* BSD style */
+	optind = 1;
+	/* optreset = 1; */
+#endif
+	/* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
+	/* (values above are what they initialized to in glibc and uclibc) */
+	/* option_mask32 = 0; - not needed, no applet depends on it being 0 */
 
 	argc = 1;
 	while (argv[argc])
@@ -161,8 +185,16 @@
 			rc = 0;
 	}
 
-	/* Restoring globals */
+	/* Restoring some globals */
 	restore_nofork_data(old);
+
+	/* Other globals can be simply reset to defaults */
+#ifdef __GLIBC__
+	optind = 0;
+#else /* BSD style */
+	optind = 1;
+#endif
+
 	return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
 

Added: trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.right
===================================================================
--- trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.right	                        (rev 0)
+++ trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.right	2008-10-20 07:52:33 UTC (rev 23731)
@@ -0,0 +1 @@
+0

Added: trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.tests
===================================================================
--- trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.tests	                        (rev 0)
+++ trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.tests	2008-10-20 07:52:33 UTC (rev 23731)
@@ -0,0 +1,6 @@
+# In this test, rm is NOFORK and it modifies getopt internal state
+rm -f non_existent_file
+# Subsequent hexdump is run as NOEXEC, and thus still uses this state
+hexdump </dev/null
+# Did hexdump segfault etc?
+echo $?


Property changes on: trunk/busybox/shell/ash_test/ash-standalone/nofork_trashes_getopt.tests
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/busybox/util-linux/getopt.c
===================================================================
--- trunk/busybox/util-linux/getopt.c	2008-10-20 07:30:03 UTC (rev 23730)
+++ trunk/busybox/util-linux/getopt.c	2008-10-20 07:52:33 UTC (rev 23731)
@@ -142,7 +142,8 @@
  * Other settings are found in global variables.
  */
 #if !ENABLE_GETOPT_LONG
-#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
+#define generate_output(argv,argc,optstr,longopts) \
+	generate_output(argv,argc,optstr)
 #endif
 static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
 {
@@ -156,14 +157,6 @@
 	if (quiet_errors) /* No error reporting from getopt(3) */
 		opterr = 0;
 
-	/* Reset getopt(3) (see libbb/getopt32.c for long rant) */
-#ifdef __GLIBC__
-	optind = 0;
-#else /* BSD style */
-	optind = 1;
-	/* optreset = 1; */
-#endif
-
 	while (1) {
 		opt =
 #if ENABLE_GETOPT_LONG




More information about the busybox-cvs mailing list