diff options
| -rw-r--r-- | bin/sh/eval.c | 2 | ||||
| -rw-r--r-- | tools/regression/bin/sh/builtins/return6.4 | 3 | ||||
| -rw-r--r-- | tools/regression/bin/sh/builtins/return7.4 | 6 |
3 files changed, 11 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) { diff --git a/tools/regression/bin/sh/builtins/return6.4 b/tools/regression/bin/sh/builtins/return6.4 new file mode 100644 index 0000000..e4d8e0d --- /dev/null +++ b/tools/regression/bin/sh/builtins/return6.4 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +while return 4; do exit 3; done diff --git a/tools/regression/bin/sh/builtins/return7.4 b/tools/regression/bin/sh/builtins/return7.4 new file mode 100644 index 0000000..2047373 --- /dev/null +++ b/tools/regression/bin/sh/builtins/return7.4 @@ -0,0 +1,6 @@ +# $FreeBSD$ + +f() { + while return 4; do exit 3; done +} +f |
