summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-07-20 16:25:03 +0200
committerDenys Vlasenko2017-07-20 16:25:03 +0200
commitebe3c35d004463a423b0b9dc77a8a113a7353ba6 (patch)
tree62c4b9408398a9731eabbef5fb0269b2d2be77ee
parenteae12688c9bb056b21e4e62fc295be5ebdcb8b7b (diff)
downloadbusybox-ebe3c35d004463a423b0b9dc77a8a113a7353ba6.zip
busybox-ebe3c35d004463a423b0b9dc77a8a113a7353ba6.tar.gz
bzcat,zcat: simplify code if gunzip/bunzip2 is not selected
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/bbunzip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 786a81f..94698d9 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -398,7 +398,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
* Normally, "zcat" is just "gunzip -c".
* But if seamless magic is enabled, then we are much more clever.
*/
- if (ENABLE_ZCAT && applet_name[1] == 'c')
+ if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
@@ -454,7 +454,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cfkvqdt");
argv += optind;
- if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
+ if (ENABLE_BZCAT && (!ENABLE_BUNZIP2 || applet_name[2] == 'c')) /* bzcat */
option_mask32 |= OPT_STDOUT;
return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");