diff options
| author | Denis Vlasenko | 2008-11-09 17:21:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-11-09 17:21:26 +0000 |
| commit | 84641942e5366b2e09367ba4f4376c99f15ecc8e (patch) | |
| tree | eff2511dcc6cb647e0bf898903f86c94b85466ad /util-linux | |
| parent | bacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94 (diff) | |
| download | busybox-84641942e5366b2e09367ba4f4376c99f15ecc8e.zip busybox-84641942e5366b2e09367ba4f4376c99f15ecc8e.tar.gz | |
apply post-1.12.1 patches, bump version to 1.12.21_12_2
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/getopt.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 4026303..8b5e46c 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -142,7 +142,8 @@ static const char *normalize(const char *arg) * 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, int argc, const char *optstr, const stru 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 |