diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-06 20:01:11 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-06 20:01:11 +0100 |
commit | aef441cb4d567da5575c498141b21eb38dc3fdaf (patch) | |
tree | f99a2ebecd77c614f243c4df859ee40f7281f9bc /archival/libarchive | |
parent | ca18e25525267736e7e919987c50569f27d70d36 (diff) | |
download | busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.tar.gz busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.tar.bz2 busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.zip |
tar: fix a bug where autodetection messes up -z on extract
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
-rw-r--r-- | archival/libarchive/get_header_tar_gz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/libarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c index b09f8691c..889fed0d9 100644 --- a/archival/libarchive/get_header_tar_gz.c +++ b/archival/libarchive/get_header_tar_gz.c | |||
@@ -9,7 +9,7 @@ | |||
9 | char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) | 9 | char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) |
10 | { | 10 | { |
11 | #if BB_MMU | 11 | #if BB_MMU |
12 | unsigned char magic[2]; | 12 | uint16_t magic; |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | /* Can't lseek over pipes */ | 15 | /* Can't lseek over pipes */ |
@@ -21,7 +21,7 @@ char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) | |||
21 | #if BB_MMU | 21 | #if BB_MMU |
22 | xread(archive_handle->src_fd, &magic, 2); | 22 | xread(archive_handle->src_fd, &magic, 2); |
23 | /* Can skip this check, but error message will be less clear */ | 23 | /* Can skip this check, but error message will be less clear */ |
24 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { | 24 | if (magic != GZIP_MAGIC) { |
25 | bb_error_msg_and_die("invalid gzip magic"); | 25 | bb_error_msg_and_die("invalid gzip magic"); |
26 | } | 26 | } |
27 | #endif | 27 | #endif |