diff options
| author | Peter Stephenson <pws@zsh.org> | 2017-09-26 09:26:57 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2017-09-26 09:26:57 +0100 |
| commit | 03af5fdbeed0930b5f1d3715ee1080fb993ed145 (patch) | |
| tree | ff6d9ff8505d7fdd336fe6e5d8291d44b993ca56 | |
| parent | 7d4b41b52aeabb6f6f95f9bdfdab96b5fd66909a (diff) | |
| download | zsh-03af5fdbeed0930b5f1d3715ee1080fb993ed145.tar.gz zsh-03af5fdbeed0930b5f1d3715ee1080fb993ed145.tar.xz zsh-03af5fdbeed0930b5f1d3715ee1080fb993ed145.zip | |
41761: Ensure status from interrupt is propagated by builtin
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/exec.c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4ed4acefe..12922e338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-09-26 Peter Stephenson <p.stephenson@samsung.com> + + * 41761: Src/exec.c: Ensure status from interrupt is propagated + from builtin. + 2017-09-25 Peter Stephenson <p.w.stephenson@ntlworld.com> * 41747: Sr/hist.c, Src/params.c, Src/subst.c. Src/zsh.h: add diff --git a/Src/exec.c b/Src/exec.c index bd242d140..161d4ac5e 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3999,8 +3999,15 @@ execcmd_exec(Estate state, Execcmd_params eparams, state->pc = opc; } dont_queue_signals(); - if (!errflag) - lastval = execbuiltin(args, assigns, (Builtin) hn); + if (!errflag) { + int ret = execbuiltin(args, assigns, (Builtin) hn); + /* + * In case of interruption assume builtin status + * is less useful than what interrupt set. + */ + if (!(errflag & ERRFLAG_INT)) + lastval = ret; + } if (do_save & BINF_COMMAND) errflag &= ~ERRFLAG_ERROR; restore_queue_signals(q); |