emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tar: fix a bug where autodetection messes up -z on extract

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-02-06 20:01:11 +01:00
parent ca18e25525
commit aef441cb4d
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
archival/libarchive/get_header_tar_gz.c
View File

@ -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