summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-01 15:59:42 +0000
committerDenis Vlasenko2008-07-01 15:59:42 +0000
commit82604e973085f91f1b99cacea08963d0d1468084 (patch)
tree2de05bb2a6943ca6be0cc46f36e5fb07099aef40 /util-linux
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 'util-linux')
-rw-r--r--util-linux/mount.c1
-rw-r--r--util-linux/script.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 664d24f..3b77af7 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -890,7 +890,6 @@ get_mountport(struct pmap *pm_mnt,
}
#if BB_MMU
-/* Unlike bb_daemonize(), parent does NOT exit here, but returns 0 */
static int daemonize(void)
{
int fd;
diff --git a/util-linux/script.c b/util-linux/script.c
index a6c1ab8..e70294e 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -87,7 +87,10 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* TODO: SIGWINCH? pass window size changes down to slave? */
- child_pid = xvfork();
+ child_pid = vfork();
+ if (child_pid < 0) {
+ bb_perror_msg_and_die("vfork");
+ }
if (child_pid) {
/* parent */