[git commit] gzip -d with zcat enabled but gunzip disabled was misbehaving
Denys Vlasenko
vda.linux at googlemail.com
Thu Jun 25 00:01:29 UTC 2020
commit: https://git.busybox.net/busybox/commit/?id=24c212b9acba0a3bbd74298d5ba076910cea51b0
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
archival/bbunzip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
More information about the busybox-cvs
mailing list