aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJilles Tjoelker <jilles@FreeBSD.org>2011-06-05 14:13:15 +0000
committerJilles Tjoelker <jilles@FreeBSD.org>2011-06-05 14:13:15 +0000
commitb3f892d9e060f365d2051e3a89d5ae0ea1bafcc6 (patch)
treedec8a05e107755532c22074f8da51760f2c5ab63 /bin
parentb17788c1a919b03246c8360087020fc71cc47b23 (diff)
downloadsrc-b3f892d9e060f365d2051e3a89d5ae0ea1bafcc6.tar.gz
src-b3f892d9e060f365d2051e3a89d5ae0ea1bafcc6.zip
Notes
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/eval.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 404de3312182..585f91ead32a 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -409,6 +409,7 @@ evalsubshell(union node *n, int flags)
struct job *jp;
int backgnd = (n->type == NBACKGND);
+ oexitstatus = exitstatus;
expredir(n->nredir.redirect);
if ((!backgnd && flags & EV_EXIT && !have_traps()) ||
forkshell(jp = makejob(n, 1), n, backgnd) == 0) {
@@ -436,6 +437,7 @@ evalredir(union node *n, int flags)
struct jmploc *savehandler;
volatile int in_redirect = 1;
+ oexitstatus = exitstatus;
expredir(n->nredir.redirect);
savehandler = handler;
if (setjmp(jmploc.loc)) {
@@ -478,7 +480,6 @@ expredir(union node *n)
for (redir = n ; redir ; redir = redir->nfile.next) {
struct arglist fn;
fn.lastp = &fn.list;
- oexitstatus = exitstatus;
switch (redir->type) {
case NFROM:
case NTO: