summaryrefslogtreecommitdiff
path: root/archival/libunarchive/open_transformer.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-10 17:43:01 +0000
committerDenis Vlasenko2008-07-10 17:43:01 +0000
commitb6052724ffc9d45894147b70e7aff226938bd2d3 (patch)
treee39d062e16d85da315cdb8cc0a96a03f15c10a23 /archival/libunarchive/open_transformer.c
parent0e2c93fc0b5f335d731ff712ce8f42d8616f05b9 (diff)
downloadbusybox-b6052724ffc9d45894147b70e7aff226938bd2d3.zip
busybox-b6052724ffc9d45894147b70e7aff226938bd2d3.tar.gz
open_transformer: do not return fd, it does not change
libbb: adopt zipped read from modprobe-small function old new delta getoptscmd 708 713 +5 qgravechar 106 109 +3 huft_build 1165 1168 +3 tr_main 474 472 -2 open_transformer 91 89 -2 evalvar 1376 1374 -2 rpm_main 1691 1688 -3 qrealloc 36 33 -3 get_header_tar_lzma 55 52 -3 get_header_tar_gz 100 97 -3 get_header_tar_bz2 55 52 -3 get_header_tar_Z 89 86 -3 find_main 418 406 -12 prepare 302 283 -19 xmalloc_open_zipped_read_close 161 135 -26 xmalloc_read 248 199 -49 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/13 up/down: 11/-130) Total: -119 bytes
Diffstat (limited to 'archival/libunarchive/open_transformer.c')
-rw-r--r--archival/libunarchive/open_transformer.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index a5ee971..42fdd96 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -11,7 +11,7 @@
* On MMU machine, the transform_prog is removed by macro magic
* in include/unarchive.h. On NOMMU, transformer is removed.
*/
-int FAST_FUNC open_transformer(int src_fd,
+void FAST_FUNC open_transformer(int fd,
USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),
const char *transform_prog)
{
@@ -32,20 +32,20 @@ int FAST_FUNC open_transformer(int src_fd,
if (pid == 0) {
/* child process */
- close(fd_pipe.rd); /* We don't want to read from the parent */
+ close(fd_pipe.rd); /* we don't want to read from the parent */
// FIXME: error check?
#if BB_MMU
- transformer(src_fd, fd_pipe.wr);
+ transformer(fd, fd_pipe.wr);
if (ENABLE_FEATURE_CLEAN_UP) {
- close(fd_pipe.wr); /* Send EOF */
- close(src_fd);
+ close(fd_pipe.wr); /* send EOF */
+ close(fd);
}
/* must be _exit! bug was actually seen here */
_exit(EXIT_SUCCESS);
#else
{
char *argv[4];
- xmove_fd(src_fd, 0);
+ xmove_fd(fd, 0);
xmove_fd(fd_pipe.wr, 1);
argv[0] = (char*)transform_prog;
argv[1] = (char*)"-cf";
@@ -59,9 +59,6 @@ int FAST_FUNC open_transformer(int src_fd,
}
/* parent process */
- close(fd_pipe.wr); /* Don't want to write to the child */
-
-//TODO: get rid of return value (become void)?
- xmove_fd(fd_pipe.rd, src_fd);
- return src_fd;
+ close(fd_pipe.wr); /* don't want to write to the child */
+ xmove_fd(fd_pipe.rd, fd);
}