Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't wait for a background job in a subshell when we are set to EV_EXIT.

Browse Source 
While I am here, call forkshell() explicitly FORK_FOO flags instead of
depending in FORK_FG == 0 and FORK_BG == 1.
This commit is contained in:
christos 2005-06-22 23:32:45 +00:00
parent 090f77819b
commit 306d33d145
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/sh/eval.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eval.c,v 1.82 2005/06/01 15:38:32 lukem Exp $ */
/* $NetBSD: eval.c,v 1.83 2005/06/22 23:32:45 christos Exp $ */
/*-
* Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
__RCSID("$NetBSD: eval.c,v 1.82 2005/06/01 15:38:32 lukem Exp $");
__RCSID("$NetBSD: eval.c,v 1.83 2005/06/22 23:32:45 christos Exp $");
#endif
#endif /* not lint */
@ -426,7 +426,7 @@ evalsubshell(union node *n, int flags)
expredir(n->nredir.redirect);
INTOFF;
jp = makejob(n, 1);
if (forkshell(jp, n, backgnd) == 0) {
if (forkshell(jp, n, backgnd ? FORK_BG : FORK_FG) == 0) {
INTON;
if (backgnd)
flags &=~ EV_TESTED;
@ -434,7 +434,7 @@ evalsubshell(union node *n, int flags)
/* never returns */
evaltree(n->nredir.n, flags | EV_EXIT);
}
if (! backgnd)
if (! backgnd && (flags & EV_EXIT) == 0)
exitstatus = waitforjob(jp);
INTON;
}
@ -507,7 +507,7 @@ evalpipe(union node *n)
error("Pipe call failed");
}
}
if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) {
if (forkshell(jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG) == 0) {
INTON;
if (prevfd > 0) {
close(0);