aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorPascal Bellard <pascal.bellard@ads-lu.com>2010-07-04 15:32:38 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-04 15:32:38 +0200
commit926031b7640bf5aad2ffcd54b096911743a47d97 (patch)
tree093e0e1bab2c905a97c5880e4942e2000ada7e72 /archival
parent243d1757d798a0cd43f51eb1db75cc1e81c65732 (diff)
downloadbusybox-w32-926031b7640bf5aad2ffcd54b096911743a47d97.tar.gz
busybox-w32-926031b7640bf5aad2ffcd54b096911743a47d97.tar.bz2
busybox-w32-926031b7640bf5aad2ffcd54b096911743a47d97.zip
*: introduce and use xfork() and xvfork()
function old new delta launch_helper 170 169 -1 setup_heredoc 312 302 -10 handle_dir_common 367 354 -13 expand_vars_to_list 2456 2443 -13 open_transformer 89 74 -15 data_extract_to_command 439 423 -16 do_ipaddr 1406 1389 -17 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-85) Total: -85 bytes Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/libunarchive/data_extract_to_command.c7
-rw-r--r--archival/libunarchive/open_transformer.c14
-rw-r--r--archival/tar.c4
3 files changed, 5 insertions, 20 deletions
diff --git a/archival/libunarchive/data_extract_to_command.c b/archival/libunarchive/data_extract_to_command.c
index eb09439bc..95f5bc864 100644
--- a/archival/libunarchive/data_extract_to_command.c
+++ b/archival/libunarchive/data_extract_to_command.c
@@ -82,11 +82,8 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
82 memset(tar_env, 0, sizeof(tar_env)); 82 memset(tar_env, 0, sizeof(tar_env));
83 83
84 xpipe(p); 84 xpipe(p);
85 pid = BB_MMU ? fork() : vfork(); 85 pid = BB_MMU ? xfork() : xvfork();
86 switch (pid) { 86 if (pid == 0) {
87 case -1:
88 bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
89 case 0:
90 /* Child */ 87 /* Child */
91 /* str2env(tar_env, TAR_FILETYPE, "f"); - parent should do it once */ 88 /* str2env(tar_env, TAR_FILETYPE, "f"); - parent should do it once */
92 oct2env(tar_env, TAR_MODE, file_header->mode); 89 oct2env(tar_env, TAR_MODE, file_header->mode);
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index 47c13e6f4..cba049f1f 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -19,19 +19,9 @@ void FAST_FUNC open_transformer(int fd,
19 int pid; 19 int pid;
20 20
21 xpiped_pair(fd_pipe); 21 xpiped_pair(fd_pipe);
22 22 pid = BB_MMU ? xfork() : xvfork();
23#if BB_MMU
24 pid = fork();
25 if (pid == -1)
26 bb_perror_msg_and_die("vfork" + 1);
27#else
28 pid = vfork();
29 if (pid == -1)
30 bb_perror_msg_and_die("vfork");
31#endif
32
33 if (pid == 0) { 23 if (pid == 0) {
34 /* child process */ 24 /* Child */
35 close(fd_pipe.rd); /* we don't want to read from the parent */ 25 close(fd_pipe.rd); /* we don't want to read from the parent */
36 // FIXME: error check? 26 // FIXME: error check?
37#if BB_MMU 27#if BB_MMU
diff --git a/archival/tar.c b/archival/tar.c
index f49fb129e..9dd74536e 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -514,9 +514,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
514 (void) &zip_exec; 514 (void) &zip_exec;
515# endif 515# endif
516 516
517 gzipPid = vfork(); 517 gzipPid = xvfork();
518 if (gzipPid < 0)
519 bb_perror_msg_and_die("vfork");
520 518
521 if (gzipPid == 0) { 519 if (gzipPid == 0) {
522 /* child */ 520 /* child */