libbb: GETOPT_RESET macro

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 3 insertions, 33 deletions

diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 497fc016f..3104826ef 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -576,13 +576,7 @@ getopt32(char **argv, const char *applet_opts, ...)
          * run_nofork_applet() does this, but we might end up here
          * also via gunzip_main() -> gzip_main(). Play safe.
          */
-#ifdef __GLIBC__
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
-        /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
+        GETOPT_RESET();
 
         /* Note: just "getopt() <= 0" will not work well for
          * "fake" short options, like this one:
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 2e7dc2d9b..fd481bf6e 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -121,28 +121,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])
@@ -167,11 +147,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 */
 }