summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-04-11 21:58:46 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2017-04-12 18:11:34 (GMT)
commit835ad3a984c5590ae4f6c94f2f0781ea049d1ae8 (patch)
treecb86c5441c258f66358faa93ef899e09a7788de8
parentc5496d3585bcab3c39f9b10f638ba0c94f5cda3f (diff)
downloadbusybox-835ad3a984c5590ae4f6c94f2f0781ea049d1ae8.zip
busybox-835ad3a984c5590ae4f6c94f2f0781ea049d1ae8.tar.gz
busybox-835ad3a984c5590ae4f6c94f2f0781ea049d1ae8.tar.bz2
libbb: GETOPT_RESET macro
Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h22
-rw-r--r--libbb/getopt32.c8
-rw-r--r--libbb/vfork_daemon_rexec.c28
-rw-r--r--runit/sv.c7
-rw-r--r--shell/shell_common.c8
-rw-r--r--util-linux/getopt.c7
6 files changed, 28 insertions, 52 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2c30bde..11d022f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1178,6 +1178,28 @@ extern uint32_t option_mask32;
extern uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC;
+/* 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 (specifically, glibc
+ * extensions ('+' and '-' at the start of the string), and requires
+ * that optind be set to zero to reset its state. BSD-derived versions
+ * of getopt() misbehaved if optind is set to 0 in order to reset getopt(),
+ * and glibc's getopt() used to coredump if optind is set 1 in order
+ * to reset getopt().
+ * Then BSD introduced additional variable "optreset" which
+ * be set to 1 in order to reset getopt(). Sigh. Standards, anyone?
+ *
+ * By ~2008, OpenBSD 3.4 was changed to survive glibc-like optind = 0
+ * (to interpret it as if optreset was set).
+ */
+#ifdef __GLIBC__
+#define GETOPT_RESET() (optind = 0)
+#else /* BSD style */
+#define GETOPT_RESET() (optind = 1)
+#endif
+
+
/* Having next pointer as a first member allows easy creation
* of "llist-compatible" structs, and using llist_FOO functions
* on them.
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 497fc01..3104826 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 2e7dc2d..fd481bf 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 */
}
diff --git a/runit/sv.c b/runit/sv.c
index 9e21322..64f1ae3 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -688,12 +688,7 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
/* getopt32() was already called:
* reset the libc getopt() function, which keeps internal state.
*/
-#ifdef __GLIBC__
- optind = 0;
-#else /* BSD style */
- optind = 1;
- /* optreset = 1; */
-#endif
+ GETOPT_RESET();
do {
if (opts & 1) {
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 549b17c..fb86e68 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -401,13 +401,7 @@ shell_builtin_ulimit(char **argv)
/* In case getopt was already called:
* reset the libc getopt() function, which keeps internal state.
*/
-#ifdef __GLIBC__
- optind = 0;
-#else /* BSD style */
- optind = 1;
- /* optreset = 1; */
-#endif
- /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
+ GETOPT_RESET();
argc = 1;
while (argv[argc])
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 63294c5..79d5485 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -246,12 +246,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
/* We used it already in main() in getopt32(),
* we *must* reset getopt(3): */
-#ifdef __GLIBC__
- optind = 0;
-#else /* BSD style */
- optind = 1;
- /* optreset = 1; */
-#endif
+ GETOPT_RESET();
while (1) {
#if ENABLE_FEATURE_GETOPT_LONG