aboutsummaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 59d8f3f99..27fab0d1b 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 ? "fork" : "vfork");
+ bb_perror_msg(BB_MMU ? "vfork" + 1 : "vfork");
} else {
pi->alive_progs++;
#if ENABLE_HUSH_JOB
@@ -3096,11 +3096,7 @@ static FILE *generate_stream_from_list(struct pipe *head)
* huge=`cat TESTFILE` # will block here forever
* echo OK
*/
- pid = BB_MMU ? fork() : xvfork();
-#if BB_MMU
- if (pid < 0)
- bb_perror_msg_and_die("fork");
-#endif
+ pid = BB_MMU ? xfork() : xvfork();
if (pid == 0) { /* child */
if (ENABLE_HUSH_JOB)
die_sleep = 0; /* let nofork's xfuncs die */