| From a741a3c18e7c383272d34b9e85815511812004b5 Mon Sep 17 00:00:00 2001 |
| From: Mike Frysinger <vapier@gentoo.org> |
| Date: Thu, 28 Feb 2013 21:28:21 -0500 |
| Subject: [PATCH 2/2] 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> |
| --- |
| archival/bbunzip.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/archival/bbunzip.c b/archival/bbunzip.c |
| index c444a2c..c5d8d38 100644 |
| --- a/archival/bbunzip.c |
| +++ b/archival/bbunzip.c |
| @@ -293,7 +293,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 */ |
| if (applet_name[1] == 'c') |
| @@ -331,7 +331,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; |
| @@ -399,7 +399,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))) |
| @@ -424,7 +424,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))) |
| -- |
| 1.7.12.4 |
| |
