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 /shell/hush.c | |
| 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 'shell/hush.c')
| -rw-r--r-- | shell/hush.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index 27fab0d..72186f9 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -1902,7 +1902,7 @@ static int run_pipe(struct pipe *pi) #endif if (child->pid < 0) { /* [v]fork failed */ /* Clearly indicate, was it fork or vfork */ - bb_perror_msg(BB_MMU ? "vfork" + 1 : "vfork"); + bb_perror_msg(BB_MMU ? "fork" : "vfork"); } else { pi->alive_progs++; #if ENABLE_HUSH_JOB @@ -3096,7 +3096,9 @@ static FILE *generate_stream_from_list(struct pipe *head) * huge=`cat TESTFILE` # will block here forever * echo OK */ - pid = BB_MMU ? xfork() : xvfork(); + pid = BB_MMU ? fork() : vfork(); + if (pid < 0) + bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork"); if (pid == 0) { /* child */ if (ENABLE_HUSH_JOB) die_sleep = 0; /* let nofork's xfuncs die */ |