diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/builtin.c | 28 |
2 files changed, 34 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2012-07-15 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Bart: 30560: Src/builtin.c: unset array element by setting + to null. + 2012-07-08 Peter Stephenson <p.w.stephenson@ntlworld.com> * Danek: 30562: Completion/Solaris/Command/_dladm, @@ -16442,5 +16447,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5678 $ +* $Revision: 1.5679 $ ***************************************************** diff --git a/Src/builtin.c b/Src/builtin.c index 070cbba9b..b5a98cbd2 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3055,6 +3055,34 @@ bin_unset(char *name, char **argv, Options ops, int func) *sse = ']'; } paramtab = tht; + } else if (PM_TYPE(pm->node.flags) == PM_SCALAR || + PM_TYPE(pm->node.flags) == PM_ARRAY) { + struct value vbuf; + vbuf.isarr = (PM_TYPE(pm->node.flags) == PM_ARRAY ? + SCANPM_ARRONLY : 0); + vbuf.pm = pm; + vbuf.flags = 0; + vbuf.start = 0; + vbuf.end = -1; + vbuf.arr = 0; + *ss = '['; + if (getindex(&ss, &vbuf, SCANPM_ASSIGNING) == 0 && + vbuf.pm && !(vbuf.pm->node.flags & PM_UNSET)) { + if (PM_TYPE(pm->node.flags) == PM_SCALAR) { + setstrvalue(&vbuf, ztrdup("")); + } else { + /* start is after the element for reverse index */ + int start = vbuf.start - !!(vbuf.flags & VALFLAG_INV); + if (start < arrlen(vbuf.pm->u.arr)) { + char *arr[2]; + arr[0] = ""; + arr[1] = 0; + setarrvalue(&vbuf, zarrdup(arr)); + } + } + } + returnval = errflag; + errflag = 0; } else { zerrnam(name, "%s: invalid element for unset", s); returnval = 1; |