diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-12-17 19:50:31 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-12-17 19:51:41 +0100 |
| commit | 049f4be0b89188e1bc3e19e75c0675dd2356d3ef (patch) | |
| tree | 7b6cc1a6611683b28888f8f7172ce8ceba773c30 /Src/subst.c | |
| parent | 015e05572733aafd2a005edd507d16e2310653a0 (diff) | |
| parent | 7152094541a54c92ff937413f850e09412585b7b (diff) | |
| download | zsh-049f4be0b89188e1bc3e19e75c0675dd2356d3ef.tar.gz zsh-049f4be0b89188e1bc3e19e75c0675dd2356d3ef.zip | |
New upstream test release
Diffstat (limited to 'Src/subst.c')
| -rw-r--r-- | Src/subst.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Src/subst.c b/Src/subst.c index 932f41287..974a8456d 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -1215,7 +1215,7 @@ get_strarg(char *s, int *lenp) { convchar_t del; int len; - char tok = 0; + char ctok = 0; MB_METACHARINIT(); len = MB_METACHARLENCONV(s, &del); @@ -1243,25 +1243,25 @@ get_strarg(char *s, int *lenp) del = ZWC('>'); break; case Inpar: - tok = Outpar; + ctok = Outpar; break; case Inang: - tok = Outang; + ctok = Outang; break; case Inbrace: - tok = Outbrace; + ctok = Outbrace; break; case Inbrack: - tok = Outbrack; + ctok = Outbrack; break; } - if (tok) { + if (ctok) { /* * Looking for a matching token; we want the literal byte, * not a decoded multibyte character, so search specially. */ - while (*s && *s != tok) + while (*s && *s != ctok) s++; } else { convchar_t del2; @@ -2314,6 +2314,8 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) val = dyncat(val, "-readonly"); if (f & PM_TAGGED) val = dyncat(val, "-tag"); + if (f & PM_TAGGED_LOCAL) + val = dyncat(val, "-tag_local"); if (f & PM_EXPORTED) val = dyncat(val, "-export"); if (f & PM_UNIQUE) |