From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 25 Jun 2020 00:01:29 +0000 (+0200)
Subject: gzip -d with zcat enabled but gunzip disabled was misbehaving
X-Git-Tag: 1_32_0~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=24c212b9acba0a3bbd74298d5ba076910cea51b0;p=oweals%2Fbusybox.git

gzip -d with zcat enabled but gunzip disabled was misbehaving

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 87a802209..6244bce85 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);