diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-11-15 23:19:05 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-11-15 23:19:05 +0000 |
| commit | 5699b8525e855a0e851725980964e8755e365f5b (patch) | |
| tree | fe3d7ead1f80f5b56e44e52a651f368adf92c91d /archival/libunarchive/get_header_tar_gz.c | |
| parent | 54ac057c0016ac23b7367342f4834e33cf7d47d7 (diff) | |
| download | busybox-5699b8525e855a0e851725980964e8755e365f5b.tar.gz | |
Move from read_gz to the pipe()+fork() method.
open_transformer(), common code for pipe+fork.
Function pointer for read() no longer needed.
Allow inflate to be initialised with a specified buffer size to avoid
over-reading.
Reset static variables in inflate_get_next_window to fix a bug where
only the first file in a .zip would be be extracted.
Diffstat (limited to 'archival/libunarchive/get_header_tar_gz.c')
| -rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 17 |
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) { unsigned char magic[2]; + /* Cant lseek over pipe's */ + archive_handle->seek = seek_by_char; + archive_xread_all(archive_handle, &magic, 2); if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { bb_error_msg_and_die("Invalid gzip magic"); @@ -30,20 +33,10 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle) check_header_gzip(archive_handle->src_fd); - GZ_gzReadOpen(archive_handle->src_fd, 0, 0); - - archive_handle->read = read_gz; - archive_handle->seek = seek_by_char; - + archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS); - /* Cleanup */ - GZ_gzReadClose(); - - check_trailer_gzip(archive_handle->src_fd); - - /* Can only do one tar.gz per archive */ + /* Can only do one file at a time */ return(EXIT_FAILURE); } - |