X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Fget_header_tar_bz2.c;h=c2cbaff5fcfc0e635b988f591196c7322b634963;hb=847fa779aff2592e842654b95dc2c321885e1eec;hp=3d50aecd382c83464f6a5097938a632254d68462;hpb=2685724e2374ef74669d39aa2b1f5d1ae8799450;p=oweals%2Fbusybox.git

diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c
index 3d50aecd3..c2cbaff5f 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libunarchive/get_header_tar_bz2.c
@@ -1,78 +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 <sys/wait.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 get_header_tar_bz2(archive_handle_t *archive_handle)
 {
-	int fd_pipe[2];
-	int pid;
-
-	/* Cant lseek over pipe's */
-	archive_handle->read = safe_read;
-	archive_handle->seek = seek_by_char;
-
-	if (pipe(fd_pipe) != 0) {
-		bb_error_msg_and_die("Can't create pipe");
-	}
-
-	pid = fork();
-	if (pid == -1) {
-		bb_error_msg_and_die("Fork failed\n");
-	}
-
-	if (pid == 0) {
-		/* child process */
-	    close(fd_pipe[0]); /* We don't wan't to read from the pipe */
-	    uncompressStream(archive_handle->src_fd, fd_pipe[1]);
-		check_trailer_gzip(archive_handle->src_fd);
-	    close(fd_pipe[1]); /* Send EOF */
-	    exit(0);
-	    /* notreached */
-	}
-	/* parent process */
-	close(fd_pipe[1]); /* Don't want to write down the pipe */
-	close(archive_handle->src_fd);
-
-	archive_handle->src_fd = fd_pipe[0];
+	/* Can't lseek over pipes */
+	archive_handle->seek = seek_by_read;
 
+	archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream, "bunzip2");
 	archive_handle->offset = 0;
-	while (get_header_tar(archive_handle) == EXIT_SUCCESS);
-
-	close(fd_pipe[0]);
-printf("finished\n");
-#if 0
-	if (kill(pid, SIGTERM) == -1) {
-		bb_error_msg_and_die("Couldnt kill gunzip process");
-	}
-#endif
-	
-	/* I dont think this is needed */
-	if (waitpid(pid, NULL, 0) == -1) {
-		bb_error_msg("Couldnt wait ?");
-	}
+	while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+		continue;
 
 	/* Can only do one file at a time */
-	return(EXIT_FAILURE);
+	return EXIT_FAILURE;
 }