summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-03-01 02:28:21 (GMT)
committer Mike Frysinger <vapier@gentoo.org>2013-03-01 02:28:21 (GMT)
commit08e28e806dc6afdd1de5dac3f1471fd0310bf02b (patch)
tree26e54304152af7049407ec2efa96c5c226dc4015
parent920c1baab7e64dc3d46a8413b66c29b81d5d9bdf (diff)
downloadbusybox-08e28e806dc6afdd1de5dac3f1471fd0310bf02b.tar.gz
busybox-08e28e806dc6afdd1de5dac3f1471fd0310bf02b.tar.bz2
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 bc0f627..fe3b29b 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)
int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int gunzip_main(int argc UNUSED_PARAM, char **argv)
{
- getopt32(argv, "cfvdtqn");
+ getopt32(argv, "cfvqdtn");
argv += optind;
/* If called as zcat...
@@ -356,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 UNUSED_PARAM, char **argv)
{
- getopt32(argv, "cfvdtq");
+ getopt32(argv, "cfvqdt");
argv += optind;
if (applet_name[2] == 'c') /* bzcat */
option_mask32 |= OPT_STDOUT;
@@ -424,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 UNUSED_PARAM, char **argv)
{
- IF_LZMA(int opts =) getopt32(argv, "cfvdtq");
+ IF_LZMA(int opts =) getopt32(argv, "cfvqdt");
# if ENABLE_LZMA
/* lzma without -d or -t? */
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)
int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unxz_main(int argc UNUSED_PARAM, char **argv)
{
- IF_XZ(int opts =) getopt32(argv, "cfvdtq");
+ IF_XZ(int opts =) getopt32(argv, "cfvqdt");
# if ENABLE_XZ
/* xz without -d or -t? */
if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))