diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-10-01 11:34:48 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-10-01 11:34:48 +0000 |
| commit | 57418f3c7d72bda89fe5819882ed6d0a42c3a1b6 (patch) | |
| tree | d2f8ed036a60b7fe9b0975b8612a57e022280905 | |
| parent | 06cf28875e9046de8caf396cf5aa98f7473ef393 (diff) | |
| download | zsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.tar.gz zsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.tar.xz zsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.zip | |
25791: force return from eval-style DEBUG trap lost status
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/exec.c | 6 | ||||
| -rw-r--r-- | Test/C05debug.ztst | 10 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fbec84dbb..e278af632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-01 Peter Stephenson <pws@csr.com> + + * 25791: Src/exec.c, Test/C05debug.ztst: force return from + eval-style DEBUG trap lost status. + 2008-09-30 Peter Stephenson <pws@csr.com> * Frank Terbeck: 25778: Functions/VCS_Info/VCS_INFO_realpath: use diff --git a/Src/exec.c b/Src/exec.c index 1685c799e..5cc92b548 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1091,7 +1091,8 @@ execlist(Estate state, int dont_change_job, int exiting) exiting = donetrap; ret = lastval; dotrap(SIGDEBUG); - lastval = ret; + if (!retflag) + lastval = ret; donetrap = exiting; noerrexit = oldnoerrexit; /* @@ -1230,7 +1231,8 @@ sublist_done: exiting = donetrap; ret = lastval; dotrap(SIGDEBUG); - lastval = ret; + if (!retflag) + lastval = ret; donetrap = exiting; noerrexit = oldnoerrexit; opts[ERREXIT] = oerrexit_opt; diff --git a/Test/C05debug.ztst b/Test/C05debug.ztst index 6594eb8a1..b5515c90c 100644 --- a/Test/C05debug.ztst +++ b/Test/C05debug.ztst @@ -137,3 +137,13 @@ >9: 'fn2' >0: 'echo wow' >wow + + foo() { + emulate -L zsh; setopt debugbeforecmd + trap '[[ $ZSH_DEBUG_CMD == *bar* ]] && return 2' DEBUG + echo foo + echo bar + } + foo +2:Status of forced return from eval-style DEBUG trap +>foo |