Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: ${foo:s/foo/bar} broken

X-seq: zsh-workers 23114
From: Peter Stephenson <pws@xxxxxxx>
To: zsh-workers@xxxxxxxxxx (Zsh hackers list)
Subject: PATCH: ${foo:s/foo/bar} broken
Date: Thu, 18 Jan 2007 16:57:47 +0000
Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm

Someone who shall remain obvious broke parameter substitution with :s
when the optional final delimiter is missing.  This occurs in
_path_files.

Index: Src/subst.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/subst.c,v
retrieving revision 1.70
diff -u -r1.70 subst.c
--- Src/subst.c	13 Dec 2006 22:30:49 -0000	1.70
+++ Src/subst.c	18 Jan 2007 16:56:18 -0000
@@ -3477,7 +3477,11 @@
 			chuck(tt--);
 		*ptr1end = sav1;
 		*ptr3 = sav;
-		*ptr = ptr3 + charlen - 1;
+		*ptr = ptr3 - 1;
+		if (*ptr3) {
+		    /* Final terminator is optional. */
+		    *ptr += charlen;
+		}
 		break;
 
 	    case '&':

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php

To get further information regarding CSR, please visit our Investor Relations page at http://ir.csr.com/csr/about/overview

Messages sorted by: Reverse Date, Date, Thread, Author