On Saturday 18 October 2008 10:19:42 pm Andreas Bühmann wrote:
> Denys Vlasenko wrote:
> > Of course, this is a bad situation, it can be improved if more people
> > will start to more actively work on shell's code in busybox.
BTW, I reproduced what you see. It's a simple matter of getopt()
state not being reset.
Please try attached patch, does it help you?
> OK, thank you very much for this clarification (and for the broad hint;
> unfortunately, my C is not fluent enough to be of much help in this
> respect).
In this case, you may still help by creating bug reports and/or
sending mails about problems you encounter. Bug us again
if we are lazy (aka "busy") and ignore a report.
--
vda
diff -d -urpN busybox.1/libbb/getopt32.c busybox.2/libbb/getopt32.c
--- busybox.1/libbb/getopt32.c 2008-10-17 16:23:07.000000000 +0200
+++ busybox.2/libbb/getopt32.c 2008-10-20 00:10:11.000000000 +0200
@@ -515,28 +515,6 @@ getopt32(char **argv, const char *applet
}
}
- /* 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
diff -d -urpN busybox.1/libbb/vfork_daemon_rexec.c busybox.2/libbb/vfork_daemon_rexec.c
--- busybox.1/libbb/vfork_daemon_rexec.c 2008-10-17 16:23:07.000000000 +0200
+++ busybox.2/libbb/vfork_daemon_rexec.c 2008-10-20 00:10:11.000000000 +0200
@@ -125,6 +125,7 @@ int FAST_FUNC run_nofork_applet_prime(st
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 @@ int FAST_FUNC run_nofork_applet_prime(st
* 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 @@ int FAST_FUNC run_nofork_applet_prime(st
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 */
}
diff -d -urpN busybox.1/util-linux/getopt.c busybox.2/util-linux/getopt.c
--- busybox.1/util-linux/getopt.c 2008-10-17 16:23:12.000000000 +0200
+++ busybox.2/util-linux/getopt.c 2008-10-20 00:10:11.000000000 +0200
@@ -142,7 +142,8 @@ static const char *normalize(const char
* 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 @@ static int generate_output(char **argv,
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
_______________________________________________
busybox mailing list
[email protected]
http://busybox.net/cgi-bin/mailman/listinfo/busybox
