Merge branch 'busybox' into merge

1 files changed, 2 insertions, 26 deletions

diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index a6d260a40..9ab49d0a1 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -123,28 +123,8 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 
         /* 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 */
+        GETOPT_RESET();
 
         argc = 1;
         while (argv[argc])
@@ -169,11 +149,7 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
         restore_nofork_data(&old);
 
         /* Other globals can be simply reset to defaults */
-#ifdef __GLIBC__
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-#endif
+        GETOPT_RESET();
 
         return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }