aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2002-11-05 02:56:57 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2002-11-05 02:56:57 +0000
commit7f2a95319b640d8a40e370352cc4a8d8b8d63e0e (patch)
tree4a3208eb2fd77b946ccedaff5de898f877eb36cc /archival/libunarchive
parent18bbca18acf229875f2bb60cc37c3e8c22d237bc (diff)
downloadbusybox-7f2a95319b640d8a40e370352cc4a8d8b8d63e0e.tar.gz
Fail silently if a partial tar header is read as tar.bz2 is leaving trailing junk (not sure why), add some missing files
Diffstat (limited to 'archival/libunarchive')
-rw-r--r--archival/libunarchive/Makefile.in1
-rw-r--r--archival/libunarchive/decompress_bunzip2.c2
-rw-r--r--archival/libunarchive/filter_accept_list_reassign.c59
-rw-r--r--archival/libunarchive/get_header_tar.c4
-rw-r--r--archival/libunarchive/get_header_tar_bz2.c39
5 files changed, 102 insertions, 3 deletions
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index 469004d5f..5675d092f 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -36,6 +36,7 @@ LIBUNARCHIVE-y:= \
\
get_header_ar.o \
get_header_tar.o \
+ get_header_tar_bz2.o \
get_header_tar_gz.o \
\
header_skip.o \
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index 00ae5a494..4b611b833 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -1274,7 +1274,7 @@ save_state_and_return:
return retVal;
}
-static void BZ2_bzReadClose(void)
+extern void BZ2_bzReadClose(void)
{
if (bzf->initialisedOk) {
bz_stream *strm = &(bzf->strm);
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
new file mode 100644
index 000000000..fa294c70a
--- /dev/null
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2002 by Glenn McGrath
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "libbb.h"
+#include "unarchive.h"
+
+/*
+ * Reassign the subarchive metadata parser based on the filename extension
+ * e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz
+ * or if its a .tar.bz2 make archive_handle->sub_archive handle that
+ */
+extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
+{
+ /* Check the file entry is in the accept list */
+ if (find_list_entry(archive_handle->accept, archive_handle->file_header->name)) {
+ const char *name_ptr;
+
+ /* Extract the last 2 extensions */
+ name_ptr = strrchr(archive_handle->file_header->name, '.');
+
+ /* Modify the subarchive handler based on the extension */
+#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+ if (strcmp(name_ptr, ".gz") == 0) {
+ archive_handle->sub_archive->read = read;
+ archive_handle->action_data_subarchive = get_header_tar_gz;
+ return(EXIT_SUCCESS);
+ }
+#endif
+#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);
+ }
+#endif
+ }
+ return(EXIT_FAILURE);
+}
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 20451d996..d3ff1608a 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -52,8 +52,8 @@ extern char get_header_tar(archive_handle_t *archive_handle)
/* Align header */
data_align(archive_handle, 512);
- if (archive_xread_all_eof(archive_handle, tar.raw, 512) == 0) {
- /* End of file */
+ if (archive_xread(archive_handle, tar.raw, 512) != 512) {
+ /* Assume end of file */
return(EXIT_FAILURE);
}
archive_handle->offset += 512;
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c
new file mode 100644
index 000000000..4e47166f0
--- /dev/null
+++ b/archival/libunarchive/get_header_tar_bz2.c
@@ -0,0 +1,39 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "libbb.h"
+#include "unarchive.h"
+
+extern char get_header_tar_bz2(archive_handle_t *archive_handle)
+{
+ BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0);
+
+ archive_handle->offset = 0;
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS);
+
+ /* Cleanup */
+ BZ2_bzReadClose();
+
+ /* Can only do one tar.bz2 per archive */
+ return(EXIT_FAILURE);
+}
+