Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-24 16:30:54 +00:00
Code Issues Projects Releases Wiki Activity

open_transformer: do not duplicate "<program> -cf -"

Browse Source 
text    data     bss     dec     hex filename
 677858     738    7236  685832   a7708 busybox_old
 677804     738    7236  685778   a76d2 busybox_unstripped
This commit is contained in:
Denis Vlasenko 2007-11-12 02:13:12 +00:00
parent 4bfb84db4e
commit 059c91711f
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/libunarchive/get_header_tar_bz2.c
View File

@ -11,7 +11,7 @@ char get_header_tar_bz2(archive_handle_t *archive_handle)
/* Can't lseek over pipes */ /* Can't lseek over pipes */
archive_handle->seek = seek_by_read; archive_handle->seek = seek_by_read;
archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream, "bunzip2", "bunzip2", "-cf", "-", NULL); archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream, "bunzip2");
archive_handle->offset = 0; archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS) while (get_header_tar(archive_handle) == EXIT_SUCCESS)
continue; continue;

2
archival/libunarchive/get_header_tar_gz.c
View File

@ -25,7 +25,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle)
} }
#endif #endif
archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL); archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
archive_handle->offset = 0; archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS) while (get_header_tar(archive_handle) == EXIT_SUCCESS)
continue; continue;

2
archival/libunarchive/get_header_tar_lzma.c
View File

@ -14,7 +14,7 @@ char get_header_tar_lzma(archive_handle_t * archive_handle)
/* Can't lseek over pipes */ /* Can't lseek over pipes */
archive_handle->seek = seek_by_read; archive_handle->seek = seek_by_read;
archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma", "unlzma", "-cf", "-", NULL); archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma");
archive_handle->offset = 0; archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS) while (get_header_tar(archive_handle) == EXIT_SUCCESS)
continue; continue;

26
archival/libunarchive/open_transformer.c
View File

@ -8,12 +8,12 @@
/* transformer(), more than meets the eye */ /* transformer(), more than meets the eye */
/* /*
* On MMU machine, the transform_prog and ... are stripped * On MMU machine, the transform_prog is removed by macro magic
* by a macro in include/unarchive.h. On NOMMU, transformer is stripped. * in include/unarchive.h. On NOMMU, transformer is removed.
*/ */
int open_transformer(int src_fd, int open_transformer(int src_fd,
USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd), USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd),
const char *transform_prog, ...) const char *transform_prog)
{ {
int fd_pipe[2]; int fd_pipe[2];
int pid; int pid;
@ -29,9 +29,6 @@ int open_transformer(int src_fd,
bb_perror_msg_and_die("fork failed"); bb_perror_msg_and_die("fork failed");
if (pid == 0) { if (pid == 0) {
#if !BB_MMU
va_list ap;
#endif
/* child process */ /* child process */
close(fd_pipe[0]); /* We don't wan't to read from the parent */ close(fd_pipe[0]); /* We don't wan't to read from the parent */
// FIXME: error check? // FIXME: error check?
@ -43,12 +40,17 @@ int open_transformer(int src_fd,
} }
exit(0); exit(0);
#else #else
xmove_fd(src_fd, 0); {
xmove_fd(fd_pipe[1], 1); char *argv[4];
va_start(ap, transform_prog); xmove_fd(src_fd, 0);
/* hoping that va_list -> char** on our CPU is working... */ xmove_fd(fd_pipe[1], 1);
BB_EXECVP(transform_prog, (void*)ap); argv[0] = (char*)transform_prog;
bb_perror_msg_and_die("exec failed"); argv[1] = (char*)"-cf";
argv[2] = (char*)"-";
argv[3] = NULL;
BB_EXECVP(transform_prog, argv);
bb_perror_msg_and_die("exec failed");
}
#endif #endif
/* notreached */ /* notreached */
} }

2
archival/rpm.c
View File

@ -237,7 +237,7 @@ static void extract_cpio_gz(int fd)
} }
xchdir("/"); /* Install RPM's to root */ xchdir("/"); /* Install RPM's to root */
archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer, xformer_prog, xformer_prog, "-cf", "-", NULL); archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer, xformer_prog);
archive_handle->offset = 0; archive_handle->offset = 0;
while (get_header_cpio(archive_handle) == EXIT_SUCCESS) while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
continue; continue;

2
archival/tar.c
View File

@ -662,7 +662,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
bb_error_msg_and_die("invalid magic"); bb_error_msg_and_die("invalid magic");
} }
archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress, "uncompress", "uncompress", "-cf", "-", NULL); archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress, "uncompress");
archive_handle->offset = 0; archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS) while (get_header_tar(archive_handle) == EXIT_SUCCESS)
continue; continue;

6
include/unarchive.h
View File

@ -116,10 +116,10 @@ extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd);
#if BB_MMU #if BB_MMU
extern int open_transformer(int src_fd, extern int open_transformer(int src_fd,
USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd)); USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd));
#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer) #define open_transformer(src_fd, transformer, transform_prog) open_transformer(src_fd, transformer)
#else #else
extern int open_transformer(int src_fd, const char *transform_prog, ...); extern int open_transformer(int src_fd, const char *transform_prog);
#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__) #define open_transformer(src_fd, transformer, transform_prog) open_transformer(src_fd, transform_prog)
#endif #endif
#endif #endif