From aef441cb4d567da5575c498141b21eb38dc3fdaf Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Feb 2011 20:01:11 +0100 Subject: tar: fix a bug where autodetection messes up -z on extract Signed-off-by: Denys Vlasenko --- archival/libarchive/get_header_tar_gz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'archival/libarchive') diff --git a/archival/libarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c index b09f869..889fed0 100644 --- a/archival/libarchive/get_header_tar_gz.c +++ b/archival/libarchive/get_header_tar_gz.c @@ -9,7 +9,7 @@ char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) { #if BB_MMU - unsigned char magic[2]; + uint16_t magic; #endif /* Can't lseek over pipes */ @@ -21,7 +21,7 @@ char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) #if BB_MMU xread(archive_handle->src_fd, &magic, 2); /* Can skip this check, but error message will be less clear */ - if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { + if (magic != GZIP_MAGIC) { bb_error_msg_and_die("invalid gzip magic"); } #endif -- cgit v1.1