diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-10-05 21:53:26 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-10-05 21:53:26 +0000 |
| commit | 289b14113b1675b7b8d844b1f41aff1e2f3a5146 (patch) | |
| tree | 89020810aae313b94a061156efcc557d7251ba16 /Src/Zle/computil.c | |
| parent | 298a8b8130bd3f515c1aa9f8fcd901c878cbb668 (diff) | |
| download | zsh-289b14113b1675b7b8d844b1f41aff1e2f3a5146.tar.gz zsh-289b14113b1675b7b8d844b1f41aff1e2f3a5146.tar.xz zsh-289b14113b1675b7b8d844b1f41aff1e2f3a5146.zip | |
22819: improved internal use of string quotation,
plus completion bug fix with RCQUOTES
Diffstat (limited to 'Src/Zle/computil.c')
| -rw-r--r-- | Src/Zle/computil.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index bde1f79af..f13397e5e 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -3441,8 +3441,7 @@ comp_quote(char *str, int prefix) if ((x = (prefix && *str == '='))) *str = 'x'; - ret = bslashquote(str, NULL, (*compqstack == '\'' ? 1 : - (*compqstack == '"' ? 2 : 0))); + ret = quotestring(str, NULL, *compqstack); if (x) *str = *ret = '='; @@ -4344,7 +4343,7 @@ cf_ignore(char **names, LinkList ign, char *style, char *path) for (; (n = *names); names++) { if (!ztat(n, &nst, 0) && S_ISDIR(nst.st_mode)) { if (tpwd && nst.st_dev == est.st_dev && nst.st_ino == est.st_ino) { - addlinknode(ign, bslashquote(n, NULL, 0)); + addlinknode(ign, quotestring(n, NULL, QT_BACKSLASH)); continue; } if (tpar && !strncmp((c = dupstring(n)), path, pl)) { @@ -4360,7 +4359,7 @@ cf_ignore(char **names, LinkList ign, char *style, char *path) if (found || ((e = strrchr(c, '/')) && e > c + pl && !ztat(c, &st, 0) && st.st_dev == nst.st_dev && st.st_ino == nst.st_ino)) - addlinknode(ign, bslashquote(n, NULL, 0)); + addlinknode(ign, quotestring(n, NULL, QT_BACKSLASH)); } } } |