From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20933 invoked from network); 26 Oct 2004 17:06:07 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 26 Oct 2004 17:06:07 -0000 Received: (qmail 79411 invoked from network); 26 Oct 2004 17:06:02 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 26 Oct 2004 17:06:02 -0000 Received: (qmail 21391 invoked by alias); 26 Oct 2004 17:05:48 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20522 Received: (qmail 21377 invoked from network); 26 Oct 2004 17:05:47 -0000 Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 26 Oct 2004 17:05:47 -0000 Received: (qmail 78595 invoked from network); 26 Oct 2004 17:04:47 -0000 Received: from lhuumrelay3.lnd.ops.eu.uu.net (62.189.58.19) by a.mx.sunsite.dk with SMTP; 26 Oct 2004 17:04:46 -0000 Received: from MAILSWEEPER01.csr.com (mailhost1.csr.com [62.189.183.235]) by lhuumrelay3.lnd.ops.eu.uu.net (8.11.0/8.11.0) with ESMTP id i9QH4jv23492 for ; Tue, 26 Oct 2004 17:04:45 GMT Received: from EXCHANGE02.csr.com (unverified [192.168.137.45]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id ; Tue, 26 Oct 2004 18:03:39 +0100 Received: from news01.csr.com ([192.168.143.38]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Tue, 26 Oct 2004 18:07:48 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.12.11/8.12.11) with ESMTP id i9QH4ix9007738; Tue, 26 Oct 2004 18:04:44 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.12.11/8.12.11/Submit) with ESMTP id i9QH4h5u007735; Tue, 26 Oct 2004 18:04:43 +0100 Message-Id: <200410261704.i9QH4h5u007735@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk, 278368-forwarded@bugs.debian.org Subject: Re: [vincent@vinc17.org: Bug#278368: zsh-beta: svn completions no longer work] In-reply-to: <20041026144833.GA32520@scowler.net> References: <20041026144833.GA32520@scowler.net> Date: Tue, 26 Oct 2004 18:04:42 +0100 From: Peter Stephenson X-OriginalArrivalTime: 26 Oct 2004 17:07:48.0072 (UTC) FILETIME=[517E4680:01C4BB7E] X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=0.0 required=6.0 tests=none autolearn=no version=2.63 X-Spam-Hits: 0.0 Clint Adams wrote: > When I do a completion like "svn st [TAB]" in a working copy, I get > the following error message: > > _arguments:comparguments:208: invalid argument: display This is another collision between the glob code and the pattern match code as amended. I think this fixes it. That file in glob.c really needs the unmetafy treatment, too. Index: Src/glob.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/glob.c,v retrieving revision 1.36 diff -u -r1.36 glob.c --- Src/glob.c 18 Oct 2004 11:56:17 -0000 1.36 +++ Src/glob.c 26 Oct 2004 17:02:55 -0000 @@ -2206,8 +2206,20 @@ repllist = NULL; /* perform must-match test for complex closures */ - if (p->mustoff && !strstr((char *)s, (char *)p + p->mustoff)) - matched = 0; + if (p->mustoff) + { + /* + * Yuk. Probably we should rewrite this whole function to + * use an unmetafied test string. + * + * Use META_HEAPDUP because we need a terminating NULL. + */ + char *muststr = metafy((char *)p + p->mustoff, + p->patmlen, META_HEAPDUP); + + if (!strstr(s, muststr)) + matched = 0; + } /* in case we used the prog before... */ p->flags &= ~(PAT_NOTSTART|PAT_NOTEND); Index: Test/D02glob.ztst =================================================================== RCS file: /cvsroot/zsh/zsh/Test/D02glob.ztst,v retrieving revision 1.7 diff -u -r1.7 D02glob.ztst --- Test/D02glob.ztst 22 Oct 2004 15:36:40 -0000 1.7 +++ Test/D02glob.ztst 26 Oct 2004 17:02:56 -0000 @@ -312,3 +312,8 @@ [[ "" = "" ]] && echo OK 0:Empty strings >OK + + foo="this string has a : colon in it" + print ${foo%% #:*} +0:Must-match arguments in complex patterns +>this string has a -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com **********************************************************************