mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-07 21:31:17 +02:00
Code Releases Activity

44997: GLOB_COMPLETE fix for compctl file completion.

Browse source 
Dashes could cause problems in directory prefixes.
This commit is contained in:
Peter Stephenson 2019-12-10 10:32:48 +00:00
parent 06e27e940a
commit ae58388619
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2019-12-10 Peter Stephenson <p.stephenson@samsung.com>
* 44997: Src/Zle/compctl.c: prefix needed extra munging for
hyphen with GLOB_COMPLETE in compctl.
2019-12-04 Oliver Kiddle <okiddle@yahoo.co.uk> 2019-12-04 Oliver Kiddle <okiddle@yahoo.co.uk>
* 44976: Src/Zle/zle_main.c: describe-key-briefly in visual mode * 44976: Src/Zle/zle_main.c: describe-key-briefly in visual mode

22
Src/Zle/compctl.c
View file

@ -3178,7 +3178,27 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
/* Compute line prefix/suffix. */ /* Compute line prefix/suffix. */
lpl = offs; lpl = offs;
lpre = zhalloc(lpl + 1); lpre = zhalloc(lpl + 1);
memcpy(lpre, s, lpl); if (comppatmatch)
{
int ccount;
char *psrc, *pdst;
for (ccount = 0, psrc = s, pdst = lpre;
ccount < lpl;
++ccount, ++psrc, ++pdst)
{
if (*psrc == Meta)
{
ccount++;
*pdst++ = *psrc++;
*pdst = *psrc;
} else if (*psrc == Dash)
*pdst = '-';
else
*pdst = *psrc;
}
}
else
memcpy(lpre, s, lpl);
lpre[lpl] = '\0'; lpre[lpl] = '\0';
qlpre = quotename(lpre); qlpre = quotename(lpre);
lsuf = dupstring(s + offs); lsuf = dupstring(s + offs);