still completion in quotes

still completion in quotes

[Borsenkow Andrej]

bor@itsrm2% ls
a b       c\ d      uudecode
bor@itsrm2% zsh -c "ls a\\TAB
bor@itsrm2% zsh -c "ls aa\\*

sorry?

-andrej

Re: still completion in quotes

[Bart Schaefer]

On May 17,  9:39am, Borsenkow Andrej wrote:
} Subject: still completion in quotes
}
} bor@itsrm2% zsh -c "ls a\\TAB
} bor@itsrm2% zsh -c "ls aa\\*

I can reproduce the doubling of the "a", there.  Probably got introduced
by the patch for the segfault.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net   

PATCH: Re: still completion in quotes

[Sven Wischnowsky]

Borsenkow Andrej wrote:

> bor@itsrm2% ls
> a b       c\ d      uudecode
> bor@itsrm2% zsh -c "ls a\\TAB
> bor@itsrm2% zsh -c "ls aa\\*
> 
> sorry?

Oh, das ist gemein ;-)

Well, yes, we had to treat that backslash-at-the-end special
elsewhere, so we have to do the same in the nested-quotes case, too.
Right.


Bye
  Sven

Index: Src/Zle/compcore.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/compcore.c,v
retrieving revision 1.58
diff -u -r1.58 compcore.c
--- Src/Zle/compcore.c	15 May 2002 07:40:36 -0000	1.58
+++ Src/Zle/compcore.c	21 May 2002 07:45:14 -0000
@@ -1428,8 +1428,8 @@
     for (p = ns, i = swb; *p; p++, i++) {
 	if (INULL(*p)) {
 	    if (i < scs) {
-		if (*p == Bnull && p[1]) {
-                    if (remq)
+		if (*p == Bnull) {
+                    if (p[1] && remq)
                         swb -= 2;
                     if (odq) {
                         swb--;
@@ -1526,6 +1526,10 @@
 	    untokenize(ss);
 	    compsuffix = ztrdup(ss);
 	}
+        if ((i = strlen(compprefix)) &&
+            compprefix[i - 1] == '\\' && compprefix[i - 2] != '\\')
+            compprefix[i - 1] = '\0';
+        
 	tmp = tricat(compqiprefix, compiprefix, multiquote(qp, 1));
 	zsfree(compqiprefix);
 	compqiprefix = tmp;

-- 
Sven Wischnowsky                          wischnow@berkom.de