diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-06-25 02:01:29 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-06-25 02:01:29 +0200 |
| commit | 24c212b9acba0a3bbd74298d5ba076910cea51b0 (patch) | |
| tree | defab1fc76d71f7eea68665c3f341ac60b8f2a52 | |
| parent | b02f8ca9098bedad00407fdaf3c3150fc81212ce (diff) | |
| download | busybox-w32-24c212b9acba0a3bbd74298d5ba076910cea51b0.tar.gz busybox-w32-24c212b9acba0a3bbd74298d5ba076910cea51b0.tar.bz2 busybox-w32-24c212b9acba0a3bbd74298d5ba076910cea51b0.zip | |
gzip -d with zcat enabled but gunzip disabled was misbehaving
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/bbunzip.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 386 | * Normally, "zcat" is just "gunzip -c". | 386 | * Normally, "zcat" is just "gunzip -c". |
| 387 | * But if seamless magic is enabled, then we are much more clever. | 387 | * But if seamless magic is enabled, then we are much more clever. |
| 388 | */ | 388 | */ |
| 389 | if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c')) | 389 | if (ENABLE_ZCAT && applet_name[1] == 'c') |
| 390 | option_mask32 |= BBUNPK_OPT_STDOUT | BBUNPK_SEAMLESS_MAGIC; | 390 | option_mask32 |= BBUNPK_OPT_STDOUT | BBUNPK_SEAMLESS_MAGIC; |
| 391 | 391 | ||
| 392 | return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL); | 392 | return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL); |