aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-28 17:21:50 -0500
committerMike Frysinger <vapier@gentoo.org>2013-02-28 17:21:50 -0500
commit920c1baab7e64dc3d46a8413b66c29b81d5d9bdf (patch)
tree66eaa3135cb89040aa66686b5f6e5826192ae5a9
parentfb036636195be64b1a1471fc7cb2d4c3bf53a348 (diff)
downloadbusybox-w32-920c1baab7e64dc3d46a8413b66c29b81d5d9bdf.tar.gz
busybox-w32-920c1baab7e64dc3d46a8413b66c29b81d5d9bdf.tar.bz2
busybox-w32-920c1baab7e64dc3d46a8413b66c29b81d5d9bdf.zip
bbunzip: ignore the -q flag with the decompressors
The -q flag is used in shell scripts for suppressing output. Have our applets swallow the flag for compatibility. Reported-by: Mandeep Singh Baines <msb@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--archival/bbunzip.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index d59c65571..bc0f62733 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -12,8 +12,9 @@ enum {
12 OPT_FORCE = 1 << 1, 12 OPT_FORCE = 1 << 1,
13 /* only some decompressors: */ 13 /* only some decompressors: */
14 OPT_VERBOSE = 1 << 2, 14 OPT_VERBOSE = 1 << 2,
15 OPT_DECOMPRESS = 1 << 3, 15 OPT_QUIET = 1 << 3,
16 OPT_TEST = 1 << 4, 16 OPT_DECOMPRESS = 1 << 4,
17 OPT_TEST = 1 << 5,
17 SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION, 18 SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION,
18}; 19};
19 20
@@ -313,7 +314,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux)
313int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 314int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
314int gunzip_main(int argc UNUSED_PARAM, char **argv) 315int gunzip_main(int argc UNUSED_PARAM, char **argv)
315{ 316{
316 getopt32(argv, "cfvdtn"); 317 getopt32(argv, "cfvdtqn");
317 argv += optind; 318 argv += optind;
318 319
319 /* If called as zcat... 320 /* If called as zcat...
@@ -355,7 +356,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
355int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 356int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
356int bunzip2_main(int argc UNUSED_PARAM, char **argv) 357int bunzip2_main(int argc UNUSED_PARAM, char **argv)
357{ 358{
358 getopt32(argv, "cfvdt"); 359 getopt32(argv, "cfvdtq");
359 argv += optind; 360 argv += optind;
360 if (applet_name[2] == 'c') /* bzcat */ 361 if (applet_name[2] == 'c') /* bzcat */
361 option_mask32 |= OPT_STDOUT; 362 option_mask32 |= OPT_STDOUT;
@@ -423,7 +424,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
423int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 424int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
424int unlzma_main(int argc UNUSED_PARAM, char **argv) 425int unlzma_main(int argc UNUSED_PARAM, char **argv)
425{ 426{
426 IF_LZMA(int opts =) getopt32(argv, "cfvdt"); 427 IF_LZMA(int opts =) getopt32(argv, "cfvdtq");
427# if ENABLE_LZMA 428# if ENABLE_LZMA
428 /* lzma without -d or -t? */ 429 /* lzma without -d or -t? */
429 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 430 if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -448,7 +449,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux)
448int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 449int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
449int unxz_main(int argc UNUSED_PARAM, char **argv) 450int unxz_main(int argc UNUSED_PARAM, char **argv)
450{ 451{
451 IF_XZ(int opts =) getopt32(argv, "cfvdt"); 452 IF_XZ(int opts =) getopt32(argv, "cfvdtq");
452# if ENABLE_XZ 453# if ENABLE_XZ
453 /* xz without -d or -t? */ 454 /* xz without -d or -t? */
454 if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 455 if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))