aboutsummaryrefslogtreecommitdiff
path: root/archival/bbunzip.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2014-03-11 19:40:20 +0000
committerRon Yorston <rmy@pobox.com>2014-03-11 19:40:20 +0000
commitdec20ad781163656832c571d52d0303c67ea8c09 (patch)
tree830a27bc8f2383d4ba50680f5d6fac1ec5c96b6a /archival/bbunzip.c
parent0a2a7b55a9212d8fc708fd564407e5505b5e8363 (diff)
parent69f9567de28976cfbc7b216c46aa391ce82bd3b7 (diff)
downloadbusybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.tar.gz
busybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.tar.bz2
busybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r--archival/bbunzip.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 3de8e1d48..4d417f3f1 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -72,7 +72,8 @@ int FAST_FUNC bbunpack(char **argv,
72 goto err; 72 goto err;
73 } else { 73 } else {
74 /* "clever zcat" with FILE */ 74 /* "clever zcat" with FILE */
75 int fd = open_zipped(filename); 75 /* fail_if_not_compressed because zcat refuses uncompressed input */
76 int fd = open_zipped(filename, /*fail_if_not_compressed:*/ 1);
76 if (fd < 0) 77 if (fd < 0)
77 goto err_name; 78 goto err_name;
78 xmove_fd(fd, STDIN_FILENO); 79 xmove_fd(fd, STDIN_FILENO);
@@ -80,7 +81,7 @@ int FAST_FUNC bbunpack(char **argv,
80 } else 81 } else
81 if (option_mask32 & SEAMLESS_MAGIC) { 82 if (option_mask32 & SEAMLESS_MAGIC) {
82 /* "clever zcat" on stdin */ 83 /* "clever zcat" on stdin */
83 if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_detected*/ 0)) 84 if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_compressed*/ 1))
84 goto err; 85 goto err;
85 } 86 }
86 87