PATCH: read -d $'\0' doesn't work

PATCH: read -d $'\0' doesn't work

[Peter Stephenson]

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

Re: PATCH: read -d $'\0' doesn't work

[Peter Stephenson]

Peter Stephenson wrote:
> 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.

Er... except I won't, because it's a new feature.

pws


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