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

bbunzip: ignore the -q flag with the decompressors

Browse Source 
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>
This commit is contained in:
Mike Frysinger 2013-02-28 17:21:50 -05:00
parent fb03663619
commit 920c1baab7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archival/bbunzip.c
View File

@ -12,8 +12,9 @@ enum {
OPT_FORCE = 1 << 1, OPT_FORCE = 1 << 1,
/* only some decompressors: */ /* only some decompressors: */
OPT_VERBOSE = 1 << 2, OPT_VERBOSE = 1 << 2,
OPT_DECOMPRESS = 1 << 3, OPT_QUIET = 1 << 3,
OPT_TEST = 1 << 4, OPT_DECOMPRESS = 1 << 4,
OPT_TEST = 1 << 5,
SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION, SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION,
}; };
@ -313,7 +314,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux)
int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int gunzip_main(int argc UNUSED_PARAM, char **argv) int gunzip_main(int argc UNUSED_PARAM, char **argv)
{ {
getopt32(argv, "cfvdtn"); getopt32(argv, "cfvdtqn");
argv += optind; argv += optind;
/* If called as zcat... /* If called as zcat...
@ -355,7 +356,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int bunzip2_main(int argc UNUSED_PARAM, char **argv) int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{ {
getopt32(argv, "cfvdt"); getopt32(argv, "cfvdtq");
argv += optind; argv += optind;
if (applet_name[2] == 'c') /* bzcat */ if (applet_name[2] == 'c') /* bzcat */
option_mask32 |= OPT_STDOUT; option_mask32 |= OPT_STDOUT;
@ -423,7 +424,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unlzma_main(int argc UNUSED_PARAM, char **argv) int unlzma_main(int argc UNUSED_PARAM, char **argv)
{ {
IF_LZMA(int opts =) getopt32(argv, "cfvdt"); IF_LZMA(int opts =) getopt32(argv, "cfvdtq");
# if ENABLE_LZMA # if ENABLE_LZMA
/* lzma without -d or -t? */ /* lzma without -d or -t? */
if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) 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)
int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unxz_main(int argc UNUSED_PARAM, char **argv) int unxz_main(int argc UNUSED_PARAM, char **argv)
{ {
IF_XZ(int opts =) getopt32(argv, "cfvdt"); IF_XZ(int opts =) getopt32(argv, "cfvdtq");
# if ENABLE_XZ # if ENABLE_XZ
/* xz without -d or -t? */ /* xz without -d or -t? */
if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))