diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 6 | ||||
| -rw-r--r-- | Src/exec.c | 10 | ||||
| -rw-r--r-- | Test/A01grammar.ztst | 22 |
4 files changed, 42 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 491fab825..c72ecf1b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-13 Peter Stephenson <p.stephenson@samsung.com> + + * users/20203: Src/builtin., Src/exec.c, Test/A01grammar.ztst: + nested function in always traps after exit didn't work. + 2015-05-12 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 35086: Doc/Zsh/expn.yo: reapply 35067 (with 35071) which diff --git a/Src/builtin.c b/Src/builtin.c index ffde5c916..70e75ff17 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -4788,6 +4788,11 @@ bin_getopts(UNUSED(char *name), char **argv, UNUSED(Options ops), UNUSED(int fun mod_export int exit_pending; +/* Shell level at which we exit if exit_pending */ +/**/ +mod_export int +exit_level; + /* break, bye, continue, exit, logout, return -- most of these take * * one numeric argument, and the other (logout) is related to return. * * (return is treated as a logout when in a login shell.) */ @@ -4865,6 +4870,7 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func) retflag = 1; breaks = loops; exit_pending = (num << 1) | 1; + exit_level = locallevel; } } else zexit(num, 0); diff --git a/Src/exec.c b/Src/exec.c index 6a8b35a36..527dffba8 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -5101,7 +5101,15 @@ doshfunc(Shfunc shfunc, LinkList doshargs, int noreturnval) } popheap(); - if (exit_pending) { + /* + * Exit with a tidy up. + * Only leave if we're at the end of the appropriate function --- + * not a nested function. As we usually skip the function body, + * the only likely case where we need that second test is + * when we have an "always" block. The endparamscope() has + * already happened, hence the "+1" here. + */ + if (exit_pending && exit_level == locallevel+1) { if (locallevel > forklevel) { /* Still functions to return: force them to do so. */ retflag = 1; diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst index f04dddaa8..2de291906 100644 --- a/Test/A01grammar.ztst +++ b/Test/A01grammar.ztst @@ -589,3 +589,25 @@ >success2 >read it >read it + + ( + mywrap() { echo BEGIN; true; echo END } + mytest() { { exit 3 } always { mywrap }; print Exited before this } + mytest + print Exited before this, too + ) +3:Exit and always block with functions: simple +>BEGIN +>END + + ( + mytrue() { echo mytrue; return 0 } + mywrap() { echo BEGIN; mytrue; echo END } + mytest() { { exit 4 } always { mywrap }; print Exited before this } + mytest + print Exited before this, too + ) +4:Exit and always block with functions: nested +>BEGIN +>mytrue +>END |