projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b02f8ca
)
gzip -d with zcat enabled but gunzip disabled was misbehaving
author
Denys Vlasenko
<vda.linux@googlemail.com>
Thu, 25 Jun 2020 00:01:29 +0000
(
02:01
+0200)
committer
Denys Vlasenko
<vda.linux@googlemail.com>
Thu, 25 Jun 2020 00:01:29 +0000
(
02:01
+0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
archival/bbunzip.c
patch
|
blob
|
history
diff --git
a/archival/bbunzip.c
b/archival/bbunzip.c
index 87a80220969f6a1a7759d4b4910e39de472639e2..6244bce853e0da9b80254d96ce317da79b7d3e9f 100644
(file)
--- 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);