aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJilles Tjoelker <jilles@FreeBSD.org>2010-03-06 17:09:22 +0000
committerJilles Tjoelker <jilles@FreeBSD.org>2010-03-06 17:09:22 +0000
commit544754df6ff92ef2dbf542e1928e0de4f7e18559 (patch)
tree4b967f0eefc77e4d0c584d3f2269ffeb52a3bfb8 /bin
parentc848bc18e8d3de0c74834f0980f57b141aa9b989 (diff)
Notes
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/eval.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index c0a7601a6165..b1de3065b4be 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -914,6 +914,9 @@ cmddone:
backcmd->nleft = memout.nextc - memout.buf;
memout.buf = NULL;
}
+ if (cmdentry.u.index != EXECCMD &&
+ (e == -1 || e == EXERROR || e == EXEXEC))
+ popredir();
if (e != -1) {
if ((e != EXERROR && e != EXEXEC)
|| cmdentry.special)
@@ -922,8 +925,6 @@ cmddone:
if (flags != EV_BACKCMD)
FORCEINTON;
}
- if (cmdentry.u.index != EXECCMD)
- popredir();
} else {
#ifdef DEBUG
trputs("normal command: "); trargs(argv);