aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-28 21:28:21 -0500
committerMike Frysinger <vapier@gentoo.org>2013-02-28 21:28:21 -0500
commit08e28e806dc6afdd1de5dac3f1471fd0310bf02b (patch)
tree26e54304152af7049407ec2efa96c5c226dc4015
parent920c1baab7e64dc3d46a8413b66c29b81d5d9bdf (diff)
downloadbusybox-w32-08e28e806dc6afdd1de5dac3f1471fd0310bf02b.tar.gz
busybox-w32-08e28e806dc6afdd1de5dac3f1471fd0310bf02b.tar.bz2
busybox-w32-08e28e806dc6afdd1de5dac3f1471fd0310bf02b.zip
bbunzip: fix order of flags vs bit defines
Too much code shuffling. Reported-by: Mandeep Singh Baines <msb@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--archival/bbunzip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index bc0f62733..fe3b29b78 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -314,7 +314,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux)
314int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 314int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
315int gunzip_main(int argc UNUSED_PARAM, char **argv) 315int gunzip_main(int argc UNUSED_PARAM, char **argv)
316{ 316{
317 getopt32(argv, "cfvdtqn"); 317 getopt32(argv, "cfvqdtn");
318 argv += optind; 318 argv += optind;
319 319
320 /* If called as zcat... 320 /* If called as zcat...
@@ -356,7 +356,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
356int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 356int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
357int bunzip2_main(int argc UNUSED_PARAM, char **argv) 357int bunzip2_main(int argc UNUSED_PARAM, char **argv)
358{ 358{
359 getopt32(argv, "cfvdtq"); 359 getopt32(argv, "cfvqdt");
360 argv += optind; 360 argv += optind;
361 if (applet_name[2] == 'c') /* bzcat */ 361 if (applet_name[2] == 'c') /* bzcat */
362 option_mask32 |= OPT_STDOUT; 362 option_mask32 |= OPT_STDOUT;
@@ -424,7 +424,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
424int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 424int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
425int unlzma_main(int argc UNUSED_PARAM, char **argv) 425int unlzma_main(int argc UNUSED_PARAM, char **argv)
426{ 426{
427 IF_LZMA(int opts =) getopt32(argv, "cfvdtq"); 427 IF_LZMA(int opts =) getopt32(argv, "cfvqdt");
428# if ENABLE_LZMA 428# if ENABLE_LZMA
429 /* lzma without -d or -t? */ 429 /* lzma without -d or -t? */
430 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 430 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -449,7 +449,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux)
449int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 449int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
450int unxz_main(int argc UNUSED_PARAM, char **argv) 450int unxz_main(int argc UNUSED_PARAM, char **argv)
451{ 451{
452 IF_XZ(int opts =) getopt32(argv, "cfvdtq"); 452 IF_XZ(int opts =) getopt32(argv, "cfvqdt");
453# if ENABLE_XZ 453# if ENABLE_XZ
454 /* xz without -d or -t? */ 454 /* xz without -d or -t? */
455 if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 455 if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))