From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16155 invoked from network); 18 Jan 2007 16:58:16 -0000 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO autolearn=ham version=3.1.7 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 18 Jan 2007 16:58:16 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 88413 invoked from network); 18 Jan 2007 16:58:10 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 18 Jan 2007 16:58:10 -0000 Received: (qmail 2993 invoked by alias); 18 Jan 2007 16:58:06 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23114 Received: (qmail 2982 invoked from network); 18 Jan 2007 16:58:05 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 18 Jan 2007 16:58:05 -0000 Received: (qmail 88136 invoked from network); 18 Jan 2007 16:58:05 -0000 Received: from cluster-c.mailcontrol.com (168.143.177.190) by a.mx.sunsite.dk with SMTP; 18 Jan 2007 16:57:59 -0000 Received: from cameurexb01.EUROPE.ROOT.PRI ([62.189.241.200]) by rly17c.srv.mailcontrol.com (MailControl) with ESMTP id l0IGvrrc005495 for ; Thu, 18 Jan 2007 16:57:54 GMT Received: from news01.csr.com ([10.103.143.38]) by cameurexb01.EUROPE.ROOT.PRI with Microsoft SMTPSVC(6.0.3790.1830); Thu, 18 Jan 2007 16:57:53 +0000 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.13.8/8.13.4) with ESMTP id l0IGvniK009297 for ; Thu, 18 Jan 2007 16:57:50 GMT Received: from csr.com (pws@localhost) by news01.csr.com (8.13.8/8.13.8/Submit) with ESMTP id l0IGvmrk009293 for ; Thu, 18 Jan 2007 16:57:48 GMT Message-Id: <200701181657.l0IGvmrk009293@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: ${foo:s/foo/bar} broken Date: Thu, 18 Jan 2007 16:57:47 +0000 From: Peter Stephenson X-OriginalArrivalTime: 18 Jan 2007 16:57:53.0341 (UTC) FILETIME=[CB4206D0:01C73B21] Content-Type: text/plain MIME-Version: 1.0 X-Scanned-By: MailControl A-07-06-80 (www.mailcontrol.com) on 10.67.0.127 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 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