aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2002-11-13 00:24:20 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2002-11-13 00:24:20 +0000
commite356883ffb0c7300aa0312864ddf203a6d322d94 (patch)
treee5ef4635958a251b3a751437841471ba85c44665 /archival/libunarchive
parent034c371bb2ea7d66caf3ac29178ce941837edb9f (diff)
downloadbusybox-w32-e356883ffb0c7300aa0312864ddf203a6d322d94.tar.gz
busybox-w32-e356883ffb0c7300aa0312864ddf203a6d322d94.tar.bz2
busybox-w32-e356883ffb0c7300aa0312864ddf203a6d322d94.zip
Minor cleanups
Diffstat (limited to 'archival/libunarchive')
-rw-r--r--archival/libunarchive/filter_accept_list_reassign.c1
-rw-r--r--archival/libunarchive/get_header_tar_bz2.c3
-rw-r--r--archival/libunarchive/get_header_tar_gz.c3
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)
48#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 48#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
49 if (strcmp(name_ptr, ".bz2") == 0) { 49 if (strcmp(name_ptr, ".bz2") == 0) {
50 archive_handle->sub_archive->read = read_bz2; 50 archive_handle->sub_archive->read = read_bz2;
51// BZ2_bzReadOpen(archive_handle->sub_archive->src_fd, NULL, 0);
52 BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0); 51 BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0);
53 archive_handle->action_data_subarchive = get_header_tar; 52 archive_handle->action_data_subarchive = get_header_tar;
54 return(EXIT_SUCCESS); 53 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)
27{ 27{
28 BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0); 28 BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0);
29 29
30 archive_handle->read = read_bz2;
31 archive_handle->seek = seek_by_char;
32
30 archive_handle->offset = 0; 33 archive_handle->offset = 0;
31 while (get_header_tar(archive_handle) == EXIT_SUCCESS); 34 while (get_header_tar(archive_handle) == EXIT_SUCCESS);
32 35
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)
28 int fd_pipe[2]; 28 int fd_pipe[2];
29 int pid; 29 int pid;
30 unsigned char magic[2]; 30 unsigned char magic[2];
31 31
32 /* Cant lseek over pipe's */ 32 /* Cant lseek over pipe's */
33 archive_handle->read = read;
33 archive_handle->seek = seek_by_char; 34 archive_handle->seek = seek_by_char;
34 35
35 archive_xread_all(archive_handle, &magic, 2); 36 archive_xread_all(archive_handle, &magic, 2);