summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-11-14 00:59:55 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-11-14 00:59:55 (GMT)
commitc08c3f5d262acab7082cca88d0b2a329184b133b (patch)
treef43b0d66a484627f498198cb71b9d69f51a71d03
parent2b662c5deceb43a10f815424de85c1416c379e2a (diff)
downloadbusybox-c08c3f5d262acab7082cca88d0b2a329184b133b.tar.gz
busybox-c08c3f5d262acab7082cca88d0b2a329184b133b.tar.bz2
hush: preparatory patch for set -o pipefail support
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 9dd30c4..126aaf0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6309,7 +6309,8 @@ static int checkjobs(struct pipe *fg_pipe)
#endif
/* Were we asked to wait for fg pipe? */
if (fg_pipe) {
- for (i = 0; i < fg_pipe->num_cmds; i++) {
+ i = fg_pipe->num_cmds;
+ while (--i >= 0) {
debug_printf_jobs("check pid %d\n", fg_pipe->cmds[i].pid);
if (fg_pipe->cmds[i].pid != childpid)
continue;
@@ -6338,19 +6339,19 @@ static int checkjobs(struct pipe *fg_pipe)
}
debug_printf_jobs("fg_pipe: alive_cmds %d stopped_cmds %d\n",
fg_pipe->alive_cmds, fg_pipe->stopped_cmds);
- if (fg_pipe->alive_cmds - fg_pipe->stopped_cmds <= 0) {
+ if (fg_pipe->alive_cmds == fg_pipe->stopped_cmds) {
/* All processes in fg pipe have exited or stopped */
/* Note: *non-interactive* bash does not continue if all processes in fg pipe
* are stopped. Testcase: "cat | cat" in a script (not on command line!)
* and "killall -STOP cat" */
if (G_interactive_fd) {
#if ENABLE_HUSH_JOB
- if (fg_pipe->alive_cmds)
+ if (fg_pipe->alive_cmds != 0)
insert_bg_job(fg_pipe);
#endif
return rcode;
}
- if (!fg_pipe->alive_cmds)
+ if (fg_pipe->alive_cmds == 0)
return rcode;
}
/* There are still running processes in the fg pipe */