zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: ${foo:s/foo/bar} broken
@ 2007-01-18 16:57 Peter Stephenson
  0 siblings, 0 replies; only message in thread
From: Peter Stephenson @ 2007-01-18 16:57 UTC (permalink / raw)
  To: Zsh hackers list

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@csr.com>                  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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-01-18 16:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-18 16:57 PATCH: ${foo:s/foo/bar} broken Peter Stephenson

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).