mirror of
https://github.com/sheumann/hush.git
synced 2024-09-09 11:54:33 +00:00
2685724e23
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.
79 lines
2.1 KiB
C
79 lines
2.1 KiB
C
/*
|
|
* 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 <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)
|
|
{
|
|
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];
|
|
|
|
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 ?");
|
|
}
|
|
|
|
/* Can only do one file at a time */
|
|
return(EXIT_FAILURE);
|
|
}
|