aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive/open_transformer.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-11-12 02:13:12 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-11-12 02:13:12 +0000
commit059c91711f664927534246bd5c1d5e202fcf8e1d (patch)
treebf40a8f1895af5bae790c65435c8d4ae621c55cf /archival/libunarchive/open_transformer.c
parent4bfb84db4e941e227f07346a3b3a56afd7d1e3fe (diff)
downloadbusybox-059c91711f664927534246bd5c1d5e202fcf8e1d.tar.gz
busybox-059c91711f664927534246bd5c1d5e202fcf8e1d.tar.bz2
open_transformer: do not duplicate "<program> -cf -"
text data bss dec hex filename 677858 738 7236 685832 a7708 busybox_old 677804 738 7236 685778 a76d2 busybox_unstripped
Diffstat (limited to 'archival/libunarchive/open_transformer.c')
-rw-r--r--archival/libunarchive/open_transformer.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index 355613a67..757a2a389 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -8,12 +8,12 @@
/* transformer(), more than meets the eye */
/*
- * On MMU machine, the transform_prog and ... are stripped
- * by a macro in include/unarchive.h. On NOMMU, transformer is stripped.
+ * On MMU machine, the transform_prog is removed by macro magic
+ * in include/unarchive.h. On NOMMU, transformer is removed.
*/
int open_transformer(int src_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 pid;
@@ -29,9 +29,6 @@ int open_transformer(int src_fd,
bb_perror_msg_and_die("fork failed");
if (pid == 0) {
-#if !BB_MMU
- va_list ap;
-#endif
/* child process */
close(fd_pipe[0]); /* We don't wan't to read from the parent */
// FIXME: error check?
@@ -43,12 +40,17 @@ int open_transformer(int src_fd,
}
exit(0);
#else
- xmove_fd(src_fd, 0);
- xmove_fd(fd_pipe[1], 1);
- va_start(ap, transform_prog);
- /* hoping that va_list -> char** on our CPU is working... */
- BB_EXECVP(transform_prog, (void*)ap);
- bb_perror_msg_and_die("exec failed");
+ {
+ char *argv[4];
+ xmove_fd(src_fd, 0);
+ xmove_fd(fd_pipe[1], 1);
+ argv[0] = (char*)transform_prog;
+ argv[1] = (char*)"-cf";
+ argv[2] = (char*)"-";
+ argv[3] = NULL;
+ BB_EXECVP(transform_prog, argv);
+ bb_perror_msg_and_die("exec failed");
+ }
#endif
/* notreached */
}