summaryrefslogtreecommitdiff
path: root/archival/libunarchive/get_header_tar_gz.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--archival/libunarchive/get_header_tar_gz.c9
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 85070d978..a99061411 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -8,19 +8,26 @@
8 8
9char get_header_tar_gz(archive_handle_t *archive_handle) 9char get_header_tar_gz(archive_handle_t *archive_handle)
10{ 10{
11#if BB_MMU
11 unsigned char magic[2]; 12 unsigned char magic[2];
13#endif
12 14
13 /* Can't lseek over pipes */ 15 /* Can't lseek over pipes */
14 archive_handle->seek = seek_by_read; 16 archive_handle->seek = seek_by_read;
15 17
18 /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
19 * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
20 * need the header. */
21#if BB_MMU
16 xread(archive_handle->src_fd, &magic, 2); 22 xread(archive_handle->src_fd, &magic, 2);
17 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { 23 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
18 bb_error_msg_and_die("invalid gzip magic"); 24 bb_error_msg_and_die("invalid gzip magic");
19 } 25 }
20 26
21 check_header_gzip_or_die(archive_handle->src_fd); 27 check_header_gzip_or_die(archive_handle->src_fd);
28#endif
22 29
23 archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream); 30 archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL);
24 archive_handle->offset = 0; 31 archive_handle->offset = 0;
25 while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/; 32 while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
26 33