summaryrefslogtreecommitdiff
path: root/archival/libunarchive/get_header_tar_gz.c
diff options
context:
space:
mode:
Diffstat (limited to 'archival/libunarchive/get_header_tar_gz.c')
-rw-r--r--archival/libunarchive/get_header_tar_gz.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index 64d08f7a7..9c708a951 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -23,6 +23,9 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle)
23{ 23{
24 unsigned char magic[2]; 24 unsigned char magic[2];
25 25
26 /* Cant lseek over pipe's */
27 archive_handle->seek = seek_by_char;
28
26 archive_xread_all(archive_handle, &magic, 2); 29 archive_xread_all(archive_handle, &magic, 2);
27 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { 30 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
28 bb_error_msg_and_die("Invalid gzip magic"); 31 bb_error_msg_and_die("Invalid gzip magic");
@@ -30,20 +33,10 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle)
30 33
31 check_header_gzip(archive_handle->src_fd); 34 check_header_gzip(archive_handle->src_fd);
32 35
33 GZ_gzReadOpen(archive_handle->src_fd, 0, 0); 36 archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip);
34
35 archive_handle->read = read_gz;
36 archive_handle->seek = seek_by_char;
37
38 archive_handle->offset = 0; 37 archive_handle->offset = 0;
39 while (get_header_tar(archive_handle) == EXIT_SUCCESS); 38 while (get_header_tar(archive_handle) == EXIT_SUCCESS);
40 39
41 /* Cleanup */ 40 /* Can only do one file at a time */
42 GZ_gzReadClose();
43
44 check_trailer_gzip(archive_handle->src_fd);
45
46 /* Can only do one tar.gz per archive */
47 return(EXIT_FAILURE); 41 return(EXIT_FAILURE);
48} 42}
49