diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-05-31 17:10:12 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-05-31 17:10:12 +0000 |
| commit | f42e3fa8e6152e145251e8f16f4c61c23dec1f59 (patch) | |
| tree | 9a7b104b910ae53f6a49cb4e35c3dedc737e907b /Src/subst.c | |
| parent | 4fec788fa5f6e7c9723e02e3d0b57068ce9785aa (diff) | |
| download | zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.tar.gz zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.tar.xz zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.zip | |
pws-20 dot-zsh-199906060520
Diffstat (limited to 'Src/subst.c')
| -rw-r--r-- | Src/subst.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Src/subst.c b/Src/subst.c index 3030218d6..47b59e793 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -279,7 +279,7 @@ multsub(char **s, char ***a, int *isarr, char *sep) *p = NULL; if (a && mult_isarr) { *a = r; - *isarr = 1; + *isarr = SCANPM_MATCHMANY; mult_isarr = omi; return 0; } @@ -976,7 +976,9 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) zerr("bad substitution", NULL, 0); return NULL; } - } else + } else if (INULL(*s)) + s++; + else break; } globsubst = globsubst && !qt; @@ -999,6 +1001,8 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) idbeg = val; copied = 1; *s = sav; + while (INULL(*s)) + s++; v = (Value) NULL; } else if (aspar) { if ((v = getvalue(&s, 1))) { |