From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-24712-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 5531 invoked from network); 14 Mar 2008 11:58:47 -0000
X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.4
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 14 Mar 2008 11:58:47 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 20551 invoked from network); 14 Mar 2008 11:58:43 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 14 Mar 2008 11:58:43 -0000
Received: (qmail 7369 invoked by alias); 14 Mar 2008 11:58:40 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 24712
Received: (qmail 7353 invoked from network); 14 Mar 2008 11:58:39 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 14 Mar 2008 11:58:39 -0000
Received: from cluster-g.mailcontrol.com (cluster-g.mailcontrol.com [85.115.41.190])
	by bifrost.dotsrc.org (Postfix) with ESMTP id 5FA7980307F7
	for <zsh-workers@sunsite.dk>; Fri, 14 Mar 2008 12:58:35 +0100 (CET)
Received: from cameurexb01.EUROPE.ROOT.PRI ([62.189.241.200])
	by rly18g.srv.mailcontrol.com (MailControl) with ESMTP id m2EBwEBl030916
	for <zsh-workers@sunsite.dk>; Fri, 14 Mar 2008 11:58:29 GMT
Received: from news01 ([10.103.143.38]) by cameurexb01.EUROPE.ROOT.PRI with Microsoft SMTPSVC(6.0.3790.3959);
	 Fri, 14 Mar 2008 11:58:20 +0000
Date: Fri, 14 Mar 2008 11:58:20 +0000
From: Peter Stephenson <pws@csr.com>
To: zsh-workers@sunsite.dk
Subject: Re: Here-documents borked in "functions" output
Message-ID: <20080314115820.77d6e22a@news01>
In-Reply-To: <20080314113641.10398594@news01>
References: <080313195243.ZM21930@torch.brasslantern.com>
	<20080314113641.10398594@news01>
Organization: CSR
X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.5; i386-redhat-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 14 Mar 2008 11:58:20.0529 (UTC) FILETIME=[B2894E10:01C885CA]
X-Scanned-By: MailControl A-08-00-04 (www.mailcontrol.com) on 10.71.0.128
X-Virus-Scanned: ClamAV 0.91.2/6228/Fri Mar 14 05:45:15 2008 on bifrost
X-Virus-Status: Clean

On Fri, 14 Mar 2008 11:36:41 +0000
Peter Stephenson <pws@csr.com> wrote:
> The new tests should catch most likely glitches.

However, there is a glitch in the quoting code; it's
independent of here-documents but there aren't many places
where we do this, so it hasn't shown up before:

% hello() {
  cat <<HERE
  I will `echo stuff` and then `echo more stuff`
  HERE
}
% functions hello
hello () {
        cat <<< "I will `echo stuff`` and then ``echo more stuff```"
}

Index: Src/utils.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/utils.c,v
retrieving revision 1.182
diff -u -r1.182 utils.c
--- Src/utils.c	27 Feb 2008 11:46:26 -0000	1.182
+++ Src/utils.c	14 Mar 2008 11:56:30 -0000
@@ -4268,6 +4268,8 @@
 		while (*u && *u != c)
 		    *v++ = *u++;
 		*v++ = c;
+		if (*u)
+		    u++;
 		continue;
 	    } else if ((*u == Qstring || *u == '$') && u[1] == '\'' &&
 		       instring == QT_DOUBLE) {

-- 
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