svn commit: trunk/busybox/libbb

vda at busybox.net vda at busybox.net
Sun Jan 27 22:40:02 UTC 2008


Author: vda
Date: 2008-01-27 14:39:55 -0800 (Sun, 27 Jan 2008)
New Revision: 20910

Log:
tentatively fix getopt state corruption for NOFORK applets



Modified:
   trunk/busybox/libbb/vfork_daemon_rexec.c


Changeset:
Modified: trunk/busybox/libbb/vfork_daemon_rexec.c
===================================================================
--- trunk/busybox/libbb/vfork_daemon_rexec.c	2008-01-27 12:50:12 UTC (rev 20909)
+++ trunk/busybox/libbb/vfork_daemon_rexec.c	2008-01-27 22:39:55 UTC (rev 20910)
@@ -131,12 +131,34 @@
 
 	applet_name = APPLET_NAME(applet_no);
 	xfunc_error_retval = EXIT_FAILURE;
-	/*option_mask32 = 0; - not needed */
-	/* special flag for xfunc_die(). If xfunc will "die"
+
+	/* Special flag for xfunc_die(). If xfunc will "die"
 	 * in NOFORK applet, xfunc_die() sees negative
 	 * die_sleep and longjmp here instead. */
 	die_sleep = -1;
 
+	/* Reset the libc getopt() function, which keeps internal state.
+	 *
+	 * BSD-derived getopt() functions require that optind be reset 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 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 ump 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
+	/* option_mask32 = 0; - not needed */
+
 	argc = 1;
 	while (argv[argc])
 		argc++;




More information about the busybox-cvs mailing list