Vared Using Spaces for characters

Vared Using Spaces for characters

[Felix Rosencrantz]

I'm seeing a problem with running multiple vared  commands on the same
command line with the latest zsh from anonymous cvs.  Tested on both
FC1&3.

Example.  (added [] to show where the cursor is placed).  In this
example I just hit return for each of the vared lines.  It displays
spaces for some of the characters on the second vared, though it
doesn't seem to change the value of the variable
zsh -f
% var1=fhardy@boys.com var2=jhardy@boys.com
% vared var1 ; vared var2
fhardy@boys.com[]
j              []
% vared var2 ; vared var1
jhardy@boys.com[]
f              []
% exit

-FR.

Re: Vared Using Spaces for characters

[Peter Stephenson]

Felix Rosencrantz wrote:
> % var1=fhardy@boys.com var2=jhardy@boys.com
> % vared var1 ; vared var2
> fhardy@boys.com[]
> j              []

This fixes it.  I'm not 100% sure we should be using strlen at all, even
in its wide character guise, instead of the lengths of the input
strings.

Index: Src/Zle/zle_refresh.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_refresh.c,v
retrieving revision 1.21
diff -u -r1.21 zle_refresh.c
--- Src/Zle/zle_refresh.c	25 Feb 2005 15:10:01 -0000	1.21
+++ Src/Zle/zle_refresh.c	4 Mar 2005 21:29:36 -0000
@@ -191,9 +191,15 @@
     }
     for (ln = 0; ln != winh + 1; ln++) {
 	if (nbuf[ln])
-	    *nbuf[ln] = ZWC('\n');
+	{
+	    nbuf[ln][0] = ZWC('\n');
+	    nbuf[ln][1] = ZWC('\0');
+	}
 	if (obuf[ln])
-	    *obuf[ln] = ZWC('\n');
+	{
+	    obuf[ln][0] = ZWC('\n');
+	    obuf[ln][0] = ZWC('\0');
+	}
     }
 
     /* TODO currently zsh core is not using widechars */
-- 
Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
Work: pws@csr.com
Web: http://www.pwstephenson.fsnet.co.uk

Re: Vared Using Spaces for characters

[Bart Schaefer]

On Mar 4,  9:34pm, Peter Stephenson wrote:
} Subject: Re: Vared Using Spaces for characters
}
} This fixes it.

Uh, really?

} +	{
} +	    obuf[ln][0] = ZWC('\n');
} +	    obuf[ln][0] = ZWC('\0');
} +	}

That second 0 should be a 1 ?