mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-05 11:01:13 +02:00
Code Releases Activity

zsh-workers/8599

Browse source
This commit is contained in:
Tanaka Akira 1999-11-09 09:01:23 +00:00
parent 126c1f2b4d
commit 95af0ef9c4
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Src/Zle/compcore.c
View file

@ -923,34 +923,40 @@ makecomplist(char *s, int incmd, int lst)
char *
multiquote(char *s, int ign)
{
char *os = s, *p = compqstack;
if (s) {
char *os = s, *p = compqstack;
if (p && *p && (ign < 1 || p[ign])) {
if (ign > 0)
p += ign;
while (*p) {
if (ign >= 0 || p[1])
s = bslashquote(s, NULL,
(*p == '\'' ? 1 : (*p == '"' ? 2 : 0)));
p++;
if (p && *p && (ign < 1 || p[ign])) {
if (ign > 0)
p += ign;
while (*p) {
if (ign >= 0 || p[1])
s = bslashquote(s, NULL,
(*p == '\'' ? 1 : (*p == '"' ? 2 : 0)));
p++;
}
}
return (s == os ? dupstring(s) : s);
}
return (s == os ? dupstring(s) : s);
return NULL;
}
/**/
char *
tildequote(char *s, int ign)
{
int tilde;
if (s) {
int tilde;
if ((tilde = (*s == '~')))
*s = 'x';
s = multiquote(s, ign);
if (tilde)
*s = '~';
if ((tilde = (*s == '~')))
*s = 'x';
s = multiquote(s, ign);
if (tilde)
*s = '~';
return s;
return s;
}
return NULL;
}
/* Check if we have to complete a parameter name. */
@ -1708,10 +1714,12 @@ addmatches(Cadata dat, char **argv)
} else if (dat->rems)
dat->rems = dupstring(dat->rems);
lpre = ((!(dat->aflags & CAF_QUOTE) &&
(!dat->ppre && (dat->flags & CMF_FILE))) ?
tildequote(lpre, 1) : multiquote(lpre, 1));
lsuf = multiquote(lsuf, 1);
if (lpre)
lpre = ((!(dat->aflags & CAF_QUOTE) &&
(!dat->ppre && (dat->flags & CMF_FILE))) ?
tildequote(lpre, 1) : multiquote(lpre, 1));
if (lsuf)
lsuf = multiquote(lsuf, 1);
}
/* Walk through the matches given. */
obpl = bpl;