mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-23 04:51:12 +02:00
Code Releases Activity

33911: turn off ERRFLAG_INT for always block.

Browse source 
Restore bit thereafter: we probably need a new variable in order
to allow user interrupts to be reset in the always block.
This commit is contained in:
Peter Stephenson 2014-12-07 19:18:23 +00:00
parent d90554e469
commit 20f694d101
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Src/loop.c
View file

@ -643,7 +643,7 @@ exectry(Estate state, int do_exec)
{ {
Wordcode end, always; Wordcode end, always;
int endval; int endval;
int save_retflag, save_breaks, save_contflag; int save_retflag, save_breaks, save_contflag, try_interrupt;
zlong save_try_errflag, save_try_tryflag; zlong save_try_errflag, save_try_tryflag;
end = state->pc + WC_TRY_SKIP(state->pc[-1]); end = state->pc + WC_TRY_SKIP(state->pc[-1]);
@ -671,8 +671,10 @@ exectry(Estate state, int do_exec)
/* The always clause. */ /* The always clause. */
save_try_errflag = try_errflag; save_try_errflag = try_errflag;
try_errflag = (zlong)errflag; try_errflag = (zlong)(errflag & ERRFLAG_ERROR);
errflag &= ~ERRFLAG_ERROR; try_interrupt = errflag & ERRFLAG_INT;
/* We need to reset all errors to allow the block to execute */
errflag = 0;
save_retflag = retflag; save_retflag = retflag;
retflag = 0; retflag = 0;
save_breaks = breaks; save_breaks = breaks;
@ -687,6 +689,17 @@ exectry(Estate state, int do_exec)
errflag |= ERRFLAG_ERROR; errflag |= ERRFLAG_ERROR;
else else
errflag &= ~ERRFLAG_ERROR; errflag &= ~ERRFLAG_ERROR;
/*
* TODO: currently, we always restore the interrupt
* error status. We should have a way of clearing it.
* Doing this with try_errflag (the shell variable TRY_BLOCK_ERROR)
* is probably not a good idea since currently that's documented
* such that setting it to 0 clears errors, and we don't want
* to clear interrupts as a side effect. So it probably needs
* a different variable.
*/
if (try_interrupt)
errflag |= ERRFLAG_INT;
try_errflag = save_try_errflag; try_errflag = save_try_errflag;
if (!retflag) if (!retflag)
retflag = save_retflag; retflag = save_retflag;