summaryrefslogtreecommitdiff
path: root/release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c
diff options
context:
space:
mode:
Diffstat (limited to 'release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c')
-rw-r--r--release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c41
1 files changed, 10 insertions, 31 deletions
diff --git a/release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c b/release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c
index b49ccae1..615bbba4 100644
--- a/release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c
+++ b/release/src/router/busybox/archival/libunarchive/get_header_tar_bz2.c
@@ -1,42 +1,21 @@
+/* vi: set sw=4 ts=4: */
/*
- * 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.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#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)
+char FAST_FUNC 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;
+ /* Can't lseek over pipes */
+ archive_handle->seek = seek_by_read;
+ open_transformer(archive_handle->src_fd, unpack_bz2_stream_prime, "bunzip2");
archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS);
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+ continue;
- /* Cleanup */
- BZ2_bzReadClose();
-
- /* Can only do one tar.bz2 per archive */
- return(EXIT_FAILURE);
+ /* Can only do one file at a time */
+ return EXIT_FAILURE;
}
-