summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko2020-06-25 02:01:29 +0200
committerDenys Vlasenko2020-06-25 02:01:29 +0200
commit24c212b9acba0a3bbd74298d5ba076910cea51b0 (patch)
treedefab1fc76d71f7eea68665c3f341ac60b8f2a52 /archival
parentb02f8ca9098bedad00407fdaf3c3150fc81212ce (diff)
downloadbusybox-24c212b9acba0a3bbd74298d5ba076910cea51b0.zip
busybox-24c212b9acba0a3bbd74298d5ba076910cea51b0.tar.gz
gzip -d with zcat enabled but gunzip disabled was misbehaving
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/bbunzip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 87a8022..6244bce 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -386,7 +386,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 && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
+ if (ENABLE_ZCAT && applet_name[1] == 'c')
option_mask32 |= BBUNPK_OPT_STDOUT | BBUNPK_SEAMLESS_MAGIC;
return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);