emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gzip: fix gzip -dc case caused by using stale getopt state

Browse Source
This commit is contained in:
Denis Vlasenko 2008-11-12 22:06:46 +00:00
parent 7753ea49bd
commit fd5a3d2812
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libbb/getopt32.c
View File

@ -155,9 +155,9 @@ Special characters:
Allows any arguments to be given without a dash (./program w x) Allows any arguments to be given without a dash (./program w x)
as well as with a dash (./program -x). as well as with a dash (./program -x).
NB: getopt32() will leak a small amount of memory if you use NB: getopt32() will leak a small amount of memory if you use
this option! Do not use it if there is a possibility of recursive this option! Do not use it if there is a possibility of recursive
getopt32() calls. getopt32() calls.
"--" A double dash at the beginning of opt_complementary means the "--" A double dash at the beginning of opt_complementary means the
argv[1] string should always be treated as options, even if it isn't argv[1] string should always be treated as options, even if it isn't
@ -165,9 +165,9 @@ Special characters:
such as "ar" and "tar": such as "ar" and "tar":
tar xvf foo.tar tar xvf foo.tar
NB: getopt32() will leak a small amount of memory if you use NB: getopt32() will leak a small amount of memory if you use
this option! Do not use it if there is a possibility of recursive this option! Do not use it if there is a possibility of recursive
getopt32() calls. getopt32() calls.
"-N" A dash as the first char in a opt_complementary group followed "-N" A dash as the first char in a opt_complementary group followed
by a single digit (0-9) means that at least N non-option by a single digit (0-9) means that at least N non-option
@ -515,6 +515,19 @@ getopt32(char **argv, const char *applet_opts, ...)
} }
} }
/* In case getopt32 was already called:
* reset the libc getopt() function, which keeps internal state.
* run_nofork_applet_prime() 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?? */
pargv = NULL; pargv = NULL;
/* Note: just "getopt() <= 0" will not work well for /* Note: just "getopt() <= 0" will not work well for