svn commit: trunk/busybox/shell
vda at busybox.net
vda at busybox.net
Mon Feb 11 08:44:37 UTC 2008
Author: vda
Date: 2008-02-11 00:44:36 -0800 (Mon, 11 Feb 2008)
New Revision: 20980
Log:
hush: die_sllep needs restoring only if job control is on
Modified:
trunk/busybox/shell/hush.c
Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c 2008-02-11 08:39:11 UTC (rev 20979)
+++ trunk/busybox/shell/hush.c 2008-02-11 08:44:36 UTC (rev 20980)
@@ -759,7 +759,8 @@
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 @@
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 @@
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 */
More information about the busybox-cvs
mailing list