diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Test/D08cmdsubst.ztst | 8 |
3 files changed, 18 insertions, 2 deletions
@@ -1,6 +1,14 @@ +2007-12-09 Barton E. Schaefer <schaefer@zsh.org> + + * 24150 plus unposted: Src/exec.c, Test/D08cmdsubst.ztst: + Retain exit status of last non-assignment command substitution + across variable assignment processing so that, in the event of + no command word to execute, the exit status of the statement is + that of the last command substitution (per POSIX). + 2007-12-09 Peter Stephenson <p.w.stephenson@ntlworld.com> - * 24197, Src/utils.c, Src/Modules/datetime.c: interface to + * 24197: Src/utils.c, Src/Modules/datetime.c: interface to ztrftime() for insufficient memory was broken. 2007-12-08 Clint Adams <clint@zsh.org> diff --git a/Src/exec.c b/Src/exec.c index 3c13da476..438e30d0d 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2339,7 +2339,7 @@ execcmd(Estate state, int input, int output, int how, int last1) lastval = 0; return; } else { - cmdoutval = 0; + cmdoutval = lastval; if (varspc) addvars(state, varspc, 0); if (errflag) diff --git a/Test/D08cmdsubst.ztst b/Test/D08cmdsubst.ztst index 6cbcbf929..015796ed6 100644 --- a/Test/D08cmdsubst.ztst +++ b/Test/D08cmdsubst.ztst @@ -81,3 +81,11 @@ >third: file1.txt file2.txt >fourth: * >fifth: file1.txt file2.txt + + $(exit 0) $(exit 3) || print $? +0:empty command uses exit value of last substitution +>3 + + X=$(exit 2) $(exit 0) || print $? +0:variable assignments processed after other substitutions +>2 |