summaryrefslogtreecommitdiff
path: root/archival/libunarchive
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-01 15:59:42 +0000
committerDenis Vlasenko2008-07-01 15:59:42 +0000
commit82604e973085f91f1b99cacea08963d0d1468084 (patch)
tree2de05bb2a6943ca6be0cc46f36e5fb07099aef40 /archival/libunarchive
parentb111917972c1398ef96ef2d388c6c4ba57a8e9f7 (diff)
downloadbusybox-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/libunarchive')
-rw-r--r--archival/libunarchive/open_transformer.c11
1 files changed, 10 insertions, 1 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 */