diff options
| author | Denys Vlasenko | 2011-10-31 01:05:16 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2011-10-31 01:05:16 +0100 |
| commit | c531b9a3e4a90fd7c91c78a6991e30bfe0134f34 (patch) | |
| tree | 63883e7ad41456977664c0a4f2d3b36d980bebd7 /archival | |
| parent | b076193f741740886a6771cfe7750adb58ce18a0 (diff) | |
| download | busybox-c531b9a3e4a90fd7c91c78a6991e30bfe0134f34.zip busybox-c531b9a3e4a90fd7c91c78a6991e30bfe0134f34.tar.gz | |
bzcat: fix unpacking of more than one file, and unpacking of zero-size bz2. Closes 4393
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/bbunzip.c | 7 | ||||
| -rw-r--r-- | archival/libarchive/decompress_bunzip2.c | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 9c1a737..853c653 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -103,7 +103,9 @@ int FAST_FUNC bbunpack(char **argv, status = unpacker(&info); if (status < 0) exitcode = 1; - xclose(STDOUT_FILENO); /* with error check! */ + + if (!(option_mask32 & OPT_STDOUT)) + xclose(STDOUT_FILENO); /* with error check! */ if (filename) { char *del = new_name; @@ -143,6 +145,9 @@ int FAST_FUNC bbunpack(char **argv, } } while (*argv && *++argv); + if (option_mask32 & OPT_STDOUT) + xclose(STDOUT_FILENO); /* with error check! */ + return exitcode; } diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c index cd31447..c4640d4 100644 --- a/archival/libarchive/decompress_bunzip2.c +++ b/archival/libarchive/decompress_bunzip2.c @@ -752,7 +752,14 @@ unpack_bz2_stream(int src_fd, int dst_fd) } } - if (i != RETVAL_LAST_BLOCK) { + if (i != RETVAL_LAST_BLOCK + /* Observed case when i == RETVAL_OK: + * "bzcat z.bz2", where "z.bz2" is a bzipped zero-length file + * (to be exact, z.bz2 is exactly these 14 bytes: + * 42 5a 68 39 17 72 45 38 50 90 00 00 00 00). + */ + && i != RETVAL_OK + ) { bb_error_msg("bunzip error %d", i); break; } |