diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/subst.c | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 9556bef8b..f65215c4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-09-06 Barton E. Schaefer <schaefer@zsh.org> + * 33118: Src/subst.c: record original param unset state when + ${name:#word} et al. need to treat empty the same as unset, to + avoid incorrect NO_UNSET error + * 33116: Src/hist.c: followup to 32580 to prevent double-locking with shared or incremental history diff --git a/Src/subst.c b/Src/subst.c index 4a5fe3a3c..1aa9b982e 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -1522,6 +1522,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) * unset. I don't quite understand why (v == NULL) isn't * good enough, but there are places where we seem to need * to second guess whether a value is a real value or not. + * See in particular the (colf && !vunset) test below. */ int vunset = 0; /* @@ -2638,8 +2639,10 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) * - (array) contains no elements * - (scalar) contains an empty string */ - if (colf && !vunset) + if (colf && !vunset) { vunset = (isarr) ? !*aval : !*val || (*val == Nularg && !val[1]); + vunset *= -1; /* Record that vunset was originally false */ + } switch (s[-1]) { case '+': @@ -2862,7 +2865,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) getmatcharr(&aval, s, flags, flnum, replstr); } else { if (vunset) { - if (unset(UNSET)) { + if (vunset > 0 && unset(UNSET)) { *idend = '\0'; zerr("%s: parameter not set", idbeg); return NULL; @@ -2892,7 +2895,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) return NULL; } if (vunset) { - if (unset(UNSET)) { + if (vunset > 0 && unset(UNSET)) { *idend = '\0'; zerr("%s: parameter not set", idbeg); return NULL; @@ -2974,7 +2977,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) *ap = NULL; } else { if (vunset) { - if (unset(UNSET)) { + if (vunset > 0 && unset(UNSET)) { *idend = '\0'; zerr("%s: parameter not set", idbeg); deletehashtable(ht); @@ -3003,7 +3006,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) } } if (vunset) { - if (unset(UNSET)) { + if (vunset > 0 && unset(UNSET)) { *idend = '\0'; zerr("%s: parameter not set", idbeg); return NULL; @@ -3020,7 +3023,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) val = dupstring(vunset ? "0" : "1"); isarr = 0; } else if (vunset) { - if (unset(UNSET)) { + if (vunset > 0 && unset(UNSET)) { *idend = '\0'; zerr("%s: parameter not set", idbeg); return NULL; |