summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2010-09-11 15:07:40 +0000
committerjilles <jilles@FreeBSD.org>2010-09-11 15:07:40 +0000
commit2beda3228fedb15b6266577cec362ec352a47ebc (patch)
tree65e2d7057e7d2471dc1b435372bef06d61070697 /bin
parent694b7e6c3713db74cbd3cd49f1e718b36a0691ec (diff)
downloadFreeBSD-src-2beda3228fedb15b6266577cec362ec352a47ebc.zip
FreeBSD-src-2beda3228fedb15b6266577cec362ec352a47ebc.tar.gz
sh: Fix exit status if return is used within a loop condition.
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/eval.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 21a0b60..29923c7 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -305,6 +305,8 @@ skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
}
if (evalskip == SKIPBREAK && --skipcount <= 0)
evalskip = 0;
+ if (evalskip == SKIPFUNC || evalskip == SKIPFILE)
+ status = exitstatus;
break;
}
if (n->type == NWHILE) {
OpenPOWER on IntegriCloud