diff options
| -rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index f77b775..a4355d2 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c @@ -14,25 +14,15 @@ * 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_gz(archive_handle_t *archive_handle) { - int fd_pipe[2]; - int pid; unsigned char magic[2]; - /* Cant lseek over pipe's */ - archive_handle->read = read; - archive_handle->seek = seek_by_char; - archive_xread_all(archive_handle, &magic, 2); if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { error_msg_and_die("Invalid gzip magic"); @@ -40,45 +30,20 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle) check_header_gzip(archive_handle->src_fd); - if (pipe(fd_pipe) != 0) { - error_msg_and_die("Can't create pipe"); - } + GZ_gzReadOpen(archive_handle->src_fd, 0, 0); - pid = fork(); - if (pid == -1) { - 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 */ - inflate(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->read = read_gz; + archive_handle->seek = seek_by_char; archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS); - if (kill(pid, SIGTERM) == -1) { - error_msg_and_die("Couldnt kill gunzip process"); - } - - /* I dont think this is needed */ -#if 0 - if (waitpid(pid, NULL, 0) == -1) { - error_msg("Couldnt wait ?"); - } -#endif + /* Cleanup */ + GZ_gzReadClose(); - /* Can only do one file at a time */ + check_trailer_gzip(archive_handle->src_fd); + + /* Can only do one tar.bz2 per archive */ return(EXIT_FAILURE); } |