From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 11 Feb 2008 08:44:36 +0000 (-0000)
Subject: hush: die_sllep needs restoring only if job control is on
X-Git-Tag: 1_10_0~197
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83177991c86dd49ac447225f33b84e1883ca49ee;p=oweals%2Fbusybox.git

hush: die_sllep needs restoring only if job control is on
---

diff --git a/shell/hush.c b/shell/hush.c
index 29807f889..3f4610391 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -759,7 +759,8 @@ static void handler_ctrl_z(int sig)
 		return;
 	ctrl_z_flag = 1;
 	if (!pid) { /* child */
-		die_sleep = 0; /* let nofork's xfuncs die */
+		if (ENABLE_HUSH_JOB)
+			die_sleep = 0; /* let nofork's xfuncs die */
 		setpgrp();
 		debug_printf_jobs("set pgrp for child %d ok\n", getpid());
 		set_every_sighandler(SIG_DFL);
@@ -1900,7 +1901,8 @@ static int run_pipe(struct pipe *pi)
 
 		child->pid = BB_MMU ? fork() : vfork();
 		if (!child->pid) { /* child */
-			die_sleep = 0; /* let nofork's xfuncs die */
+			if (ENABLE_HUSH_JOB)
+				die_sleep = 0; /* let nofork's xfuncs die */
 #if ENABLE_HUSH_JOB
 			/* Every child adds itself to new process group
 			 * with pgid == pid_of_first_child_in_pipe */
@@ -3239,7 +3241,8 @@ static FILE *generate_stream_from_list(struct pipe *head)
 	if (pid < 0)
 		bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
 	if (pid == 0) { /* child */
-		die_sleep = 0; /* let nofork's xfuncs die */
+		if (ENABLE_HUSH_JOB)
+			die_sleep = 0; /* let nofork's xfuncs die */
 		close(channel[0]);
 		xmove_fd(channel[1], 1);
 		/* Prevent it from trying to handle ctrl-z etc */