diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-10-11 16:48:05 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-10-11 16:48:05 +0000 |
| commit | cca66ab341ffa330908aa6ea8da03e991aa6903c (patch) | |
| tree | 0b15ce734ec264fdd72c27d68e48bc65bdaf6d14 /Src/subst.c | |
| parent | 1eaa7fee0d111b999c44385eb4fda1ad604e3606 (diff) | |
| download | zsh-cca66ab341ffa330908aa6ea8da03e991aa6903c.tar.gz zsh-cca66ab341ffa330908aa6ea8da03e991aa6903c.tar.xz zsh-cca66ab341ffa330908aa6ea8da03e991aa6903c.zip | |
21862/21863: GLOB_SUBST shouldn't swallow up backslashes in parameter
substitutions that don't match anything.
Diffstat (limited to 'Src/subst.c')
| -rw-r--r-- | Src/subst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/subst.c b/Src/subst.c index defb53bd9..67de61418 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -1945,7 +1945,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) */ for (ptr = s; (c = *ptr) && c != '/'; ptr++) { - if ((c == Bnull || c == '\\') && ptr[1]) + if ((c == Bnull || c == Bnullkeep || c == '\\') && ptr[1]) { if (ptr[1] == '/') chuck(ptr); @@ -2846,11 +2846,11 @@ modify(char **str, char **ptr) } zsfree(hsubr); for (tt = hsubl; *tt; tt++) - if (INULL(*tt)) + if (INULL(*tt) && *tt != Bnullkeep) chuck(tt--); untokenize(hsubl); for (tt = hsubr = ztrdup(ptr2); *tt; tt++) - if (INULL(*tt)) + if (INULL(*tt) && *tt != Bnullkeep) chuck(tt--); ptr2[-1] = del; if (sav) |