From 9772816570f0a63ac301f1885292b064e23f5310 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 28 Jan 2008 22:57:10 +0000 Subject: *: move getopt reset code to better place(s) --- util-linux/getopt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'util-linux') diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 061750e77..ee6c14393 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -155,7 +155,14 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru if (quiet_errors) /* No error reporting from getopt(3) */ opterr = 0; - optind = 0; /* Reset getopt(3) */ + + /* 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 = -- cgit v1.2.3