[BusyBox-cvs] busybox/archival/libunarchive decompress_bunzip2.c, 1.9, 1.10 get_header_tar.c, 1.23, 1.24 get_header_tar_bz2.c, 1.2, 1.3

[Glenn McGrath]

Update of /var/cvs/busybox/archival/libunarchive
In directory winder:/tmp/cvs-serv26319/archival/libunarchive

Modified Files:
	decompress_bunzip2.c get_header_tar.c get_header_tar_bz2.c 
Log Message:
Fix tar -j support
Use the old fork() method of tar compression support, rather than 
read_bz2....
 - (*uncompress)(int in, int out) seems like a more natural interface 
for compression code.
 - it might improve performance by seperating the work into one cpu 
bound and one io bound process.
 - There is extra code required to do read_[gz|bunzip] since (*uncompress)(int in, 
int out) will normally be used by the standalone compression applet. 

There have been problems with this method so if you see a "Short read" 
error let me know.
 


Index: get_header_tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- get_header_tar.c	12 Sep 2003 06:49:09 -0000	1.23
+++ get_header_tar.c	5 Nov 2003 04:55:58 -0000	1.24
@@ -65,7 +65,7 @@
 
 	/* If there is no filename its an empty header */
 	if (tar.formated.name[0] == 0) {
-		return(EXIT_SUCCESS);
+		return(EXIT_FAILURE);
 	}
 
 	/* Check header has valid magic, "ustar" is for the proper tar

Index: decompress_bunzip2.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/decompress_bunzip2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- decompress_bunzip2.c	31 Oct 2003 08:52:57 -0000	1.9
+++ decompress_bunzip2.c	5 Nov 2003 04:55:58 -0000	1.10
@@ -590,22 +590,6 @@
 	return i;
 }
 
-/* This new version is not yet properly integrated with tar */
-extern ssize_t read_bz2(int fd, void *buf, size_t count)
-{
-#warning FIXME "bzip2 tar support is broken!"
-	return(0);
-}
-
-extern void BZ2_bzReadOpen(int fd, void *unused, int nUnused)
-{
-#warning FIXME "bzip2 tar support is broken!"
-}
-extern void BZ2_bzReadClose(void)
-{
-#warning FIXME "bzip2 tar support is broken!"
-}
-
 #ifdef TESTING
 
 static char * const bunzip_errors[]={NULL,"Bad file checksum","Not bzip data",

Index: get_header_tar_bz2.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar_bz2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- get_header_tar_bz2.c	13 Nov 2002 00:24:20 -0000	1.2
+++ get_header_tar_bz2.c	5 Nov 2003 04:55:58 -0000	1.3
@@ -15,6 +15,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,18 +26,53 @@
 
 extern char get_header_tar_bz2(archive_handle_t *archive_handle)
 {
-	BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0);
+	int fd_pipe[2];
+	int pid;
 
-	archive_handle->read = read_bz2;
+	/* 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];
+
 	archive_handle->offset = 0;
 	while (get_header_tar(archive_handle) == EXIT_SUCCESS);
 
-	/* Cleanup */
-	BZ2_bzReadClose();
+	close(fd_pipe[0]);
+printf("finished\n");
+#if 0
+	if (kill(pid, SIGTERM) == -1) {
+		bb_error_msg_and_die("Couldnt kill gunzip process");
+	}
+#endif
 	
-	/* Can only do one tar.bz2 per archive */
+	/* I dont think this is needed */
+	if (waitpid(pid, NULL, 0) == -1) {
+		bb_error_msg("Couldnt wait ?");
+	}
+
+	/* Can only do one file at a time */
 	return(EXIT_FAILURE);
 }
-