Re: TRAPZERR() in chpwd()

[Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Paul Ackersviller wrote:
> I believe the change must've come after 3.1.6, since it exhibits the same
> behaviour as 3.0.7 in my experience.  It's only 3.1.7-pre-1 and (some?)
> development versions leading up to it.

Right, I think it's the wordcode stuff.  I'm pretty sure I spent some time
(possibly more than once...) getting this right a fair while ago.

Sven, can you confirm that this is the right fix before I commit it?  Or if
not, what is, because this can't be too far away from the right answer.
It seems to work with all the basic tests I've tried.

Index: Src/exec.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/exec.c,v
retrieving revision 1.5
diff -u -r1.5 exec.c
--- Src/exec.c	2000/04/10 09:18:27	1.5
+++ Src/exec.c	2000/05/02 09:15:33
@@ -836,7 +836,8 @@
 			code = *state->pc++;
 			next = state->pc + WC_SUBLIST_SKIP(code);
 		    }
-		    if (wc_code(code) != WC_SUBLIST) {
+		    if (wc_code(code) != WC_SUBLIST ||
+			WC_SUBLIST_TYPE(code) == WC_SUBLIST_END) {
 			/* We've skipped to the end of the list, not executing *
 			 * the final pipeline, so don't perform error handling *
 			 * for this sublist.                                   */
@@ -861,7 +862,8 @@
 			code = *state->pc++;
 			next = state->pc + WC_SUBLIST_SKIP(code);
 		    }
-		    if (wc_code(code) != WC_SUBLIST) {
+		    if (wc_code(code) != WC_SUBLIST ||
+			WC_SUBLIST_TYPE(code) == WC_SUBLIST_END) {
 			/* We've skipped to the end of the list, not executing *
 			 * the final pipeline, so don't perform error handling *
 			 * for this sublist.                                   */

-- 
Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxxx>
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK                          Tel: +44 (0)1223 392070