diff options
author | Peter Stephenson <pws@zsh.org> | 2015-05-13 16:17:04 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2015-05-13 16:17:04 +0100 |
commit | ec57c91b586a7682fcdb08c3704c9214cddfa5e7 (patch) | |
tree | 6baa5dd3f864f4ddec5496c29913a13e7a00f16f /Src/builtin.c | |
parent | 9c3aeef99a64c44e5a37170c9440c591f223bb4a (diff) | |
download | zsh-ec57c91b586a7682fcdb08c3704c9214cddfa5e7.tar.gz zsh-ec57c91b586a7682fcdb08c3704c9214cddfa5e7.tar.xz zsh-ec57c91b586a7682fcdb08c3704c9214cddfa5e7.zip |
users/20203: nested functions in always blocks when exit pending
Diffstat (limited to 'Src/builtin.c')
-rw-r--r-- | Src/builtin.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); |