diff options
| author | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
| commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
| tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /archival/libunarchive/get_header_tar_gz.c | |
| parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
| download | busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.zip busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.tar.gz | |
apply post 1.7.0 patches, set version to 1.7.11_7_1
Diffstat (limited to 'archival/libunarchive/get_header_tar_gz.c')
| -rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index 85070d9..a990614 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c @@ -8,19 +8,26 @@ char get_header_tar_gz(archive_handle_t *archive_handle) { +#if BB_MMU unsigned char magic[2]; +#endif /* Can't lseek over pipes */ archive_handle->seek = seek_by_read; + /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case). + * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will + * need the header. */ +#if BB_MMU xread(archive_handle->src_fd, &magic, 2); if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { bb_error_msg_and_die("invalid gzip magic"); } check_header_gzip_or_die(archive_handle->src_fd); +#endif - archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream); + archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL); archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/; |