diff options
| author | Denis Vlasenko | 2008-07-01 15:59:42 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-07-01 15:59:42 +0000 |
| commit | 82604e973085f91f1b99cacea08963d0d1468084 (patch) | |
| tree | 2de05bb2a6943ca6be0cc46f36e5fb07099aef40 /archival | |
| parent | b111917972c1398ef96ef2d388c6c4ba57a8e9f7 (diff) | |
| download | busybox-82604e973085f91f1b99cacea08963d0d1468084.zip busybox-82604e973085f91f1b99cacea08963d0d1468084.tar.gz | |
revert last two commits. vfork cannot be used in subroutine,
it trashes stack on return
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/libunarchive/open_transformer.c | 11 | ||||
| -rw-r--r-- | archival/tar.c | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c index 0738e3d..a6bc623 100644 --- a/archival/libunarchive/open_transformer.c +++ b/archival/libunarchive/open_transformer.c @@ -20,7 +20,16 @@ int FAST_FUNC open_transformer(int src_fd, xpiped_pair(fd_pipe); - pid = BB_MMU ? xfork() : xvfork(); +#if BB_MMU + pid = fork(); + if (pid == -1) + bb_perror_msg_and_die("can't fork"); +#else + pid = vfork(); + if (pid == -1) + bb_perror_msg_and_die("can't vfork"); +#endif + if (pid == 0) { /* child process */ close(fd_pipe.rd); /* We don't want to read from the parent */ diff --git a/archival/tar.c b/archival/tar.c index 17ac6c5..526edb6 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -536,7 +536,9 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip) (void) &zip_exec; #endif - gzipPid = xvfork(); + gzipPid = vfork(); + if (gzipPid < 0) + bb_perror_msg_and_die("can't vfork"); if (gzipPid == 0) { /* child */ |