diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2002-11-13 00:24:20 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2002-11-13 00:24:20 +0000 |
| commit | e356883ffb0c7300aa0312864ddf203a6d322d94 (patch) | |
| tree | e5ef4635958a251b3a751437841471ba85c44665 /archival/libunarchive | |
| parent | 034c371bb2ea7d66caf3ac29178ce941837edb9f (diff) | |
| download | busybox-e356883ffb0c7300aa0312864ddf203a6d322d94.tar.gz | |
Minor cleanups
Diffstat (limited to 'archival/libunarchive')
| -rw-r--r-- | archival/libunarchive/filter_accept_list_reassign.c | 1 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar_bz2.c | 3 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c index fa294c70a..d9bee79d7 100644 --- a/archival/libunarchive/filter_accept_list_reassign.c +++ b/archival/libunarchive/filter_accept_list_reassign.c @@ -48,7 +48,6 @@ extern char filter_accept_list_reassign(archive_handle_t *archive_handle) #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 if (strcmp(name_ptr, ".bz2") == 0) { archive_handle->sub_archive->read = read_bz2; -// BZ2_bzReadOpen(archive_handle->sub_archive->src_fd, NULL, 0); BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0); archive_handle->action_data_subarchive = get_header_tar; return(EXIT_SUCCESS); diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c index 4e47166f0..b49ccae18 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libunarchive/get_header_tar_bz2.c @@ -27,6 +27,9 @@ extern char get_header_tar_bz2(archive_handle_t *archive_handle) { BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0); + archive_handle->read = read_bz2; + archive_handle->seek = seek_by_char; + archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS); diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index f0d4b1359..f77b775d3 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c @@ -28,8 +28,9 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle) int fd_pipe[2]; int pid; unsigned char magic[2]; - + /* Cant lseek over pipe's */ + archive_handle->read = read; archive_handle->seek = seek_by_char; archive_xread_all(archive_handle, &magic, 2); |