From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4646 invoked from network); 9 Jul 2003 10:59:20 -0000 Received: from sunsite.dk (130.225.247.90) by ns1.primenet.com.au with SMTP; 9 Jul 2003 10:59:20 -0000 Received: (qmail 16934 invoked by alias); 9 Jul 2003 10:59:14 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 18836 Received: (qmail 16920 invoked from network); 9 Jul 2003 10:59:13 -0000 Received: from localhost (HELO sunsite.dk) (127.0.0.1) by localhost with SMTP; 9 Jul 2003 10:59:13 -0000 X-MessageWall-Score: 0 (sunsite.dk) Received: from [62.189.183.235] by sunsite.dk (MessageWall 1.0.8) with SMTP; 9 Jul 2003 10:59:13 -0000 Received: from EXCHANGE02.csr.com (unverified) by MAILSWEEPER01.cambridgesiliconradio.com (Content Technologies SMTPRS 4.3.10) with ESMTP id for ; Tue, 8 Jul 2003 11:58:42 +0100 Received: from csr.com ([192.168.144.127]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.5329); Wed, 9 Jul 2003 11:58:17 +0100 To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: read -d $'\0' doesn't work Date: Wed, 09 Jul 2003 11:59:11 +0100 Message-ID: <16202.1057748351@csr.com> From: Peter Stephenson X-OriginalArrivalTime: 09 Jul 2003 10:58:17.0165 (UTC) FILETIME=[006317D0:01C34609] I tried: find ... -print0 | while read -d $'\0' ... and found that NULL delimiters don't work. Since this is the most obvious use of -d, I imagine no-one uses this feature much. The read builtin doesn't handle metafied delimiters correctly. I'll apply this to 4.0, too. Possibly also 18769 (autoload error) if the dust has settled? I'm pretty convinced it's the lesser of two evils. Index: Src/builtin.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v retrieving revision 1.102 diff -u -r1.102 builtin.c --- Src/builtin.c 24 May 2003 22:46:37 -0000 1.102 +++ Src/builtin.c 9 Jul 2003 10:51:26 -0000 @@ -4231,7 +4231,8 @@ } } if (OPT_ISSET(ops,'d')) { - delim = *OPT_ARG(ops,'d'); + char *delimstr = OPT_ARG(ops,'d'); + delim = (delimstr[0] == Meta) ? delimstr[1] ^ 32 : delimstr[0]; if (SHTTY != -1) { struct ttyinfo ti; gettyinfo(&ti); Index: Test/B04read.ztst =================================================================== RCS file: /cvsroot/zsh/zsh/Test/B04read.ztst,v retrieving revision 1.1 diff -u -r1.1 B04read.ztst --- Test/B04read.ztst 26 Mar 2003 17:33:40 -0000 1.1 +++ Test/B04read.ztst 9 Jul 2003 10:51:26 -0000 @@ -63,3 +63,9 @@ 0:read with timeout (no waiting should occur) >hello >0 + + print -n 'Testing the\0null hypothesis\0' | + while read -d $'\0' line; do print $line; done +0:read with null delimiter +>Testing the +>null hypothesis -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer. **********************************************************************