mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 18:30:55 +01:00
Code Releases Activity

37914: reparse associative array subscripts in "unset" so keys with "[" or "]" may be backslash-escaped

Browse source 
Also fix erroneous test case this revealed.
This commit is contained in:
Barton E. Schaefer 2016-02-08 20:50:07 -08:00
parent 8a59aed696
commit 95663e9365
3 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -15,6 +15,12 @@
* unposted: ChangeLog: Move the 37678 entry to the correct
location (and author).
2016-02-08 Barton E. Schaefer <schaefer@zsh.org>
* 37914: Src/builtin.c, Test/E01options.ztst: reparse associative
array subscripts in "unset" so keys with "[" or "]" may be
backslash-escaped. Fix erroneous test case this revealed.
2016-02-07 Dominik Ritter <dritter03@googlemail.com>
* unposted: Doc/Zsh/mod_complist.yo: complist module docs:

30
Src/builtin.c
View file

@ -3350,15 +3350,24 @@ bin_unset(char *name, char **argv, Options ops, int func)
/* do not glob -- unset the given parameter */
queue_signals();
while ((s = *argv++)) {
char *ss = strchr(s, '[');
char *sse = ss;
char *ss = strchr(s, '['), *subscript = 0;
if (ss) {
if (skipparens('[', ']', &sse) || *sse) {
zerrnam(name, "%s: invalid parameter name", s);
returnval = 1;
continue;
}
char *sse;
*ss = 0;
if ((sse = parse_subscript(ss+1, 1, ']'))) {
*sse = 0;
subscript = dupstring(ss+1);
*sse = ']';
remnulargs(subscript);
untokenize(subscript);
}
}
if ((ss && !subscript) || !isident(s)) {
if (ss)
*ss = '[';
zerrnam(name, "%s: invalid parameter name", s);
returnval = 1;
continue;
}
pm = (Param) (paramtab == realparamtab ?
/* getnode2() to avoid autoloading */
@ -3376,11 +3385,8 @@ bin_unset(char *name, char **argv, Options ops, int func)
} else if (ss) {
if (PM_TYPE(pm->node.flags) == PM_HASHED) {
HashTable tht = paramtab;
if ((paramtab = pm->gsu.h->getfn(pm))) {
*--sse = 0;
unsetparam(ss+1);
*sse = ']';
}
if ((paramtab = pm->gsu.h->getfn(pm)))
unsetparam(subscript);
paramtab = tht;
} else if (PM_TYPE(pm->node.flags) == PM_SCALAR ||
PM_TYPE(pm->node.flags) == PM_ARRAY) {

2
Test/E01options.ztst
View file

@ -776,7 +776,7 @@
unsetopt pathdirs
pathtestdir/findme
path=($oldpath)
unset $oldpath
unset oldpath
rm -rf pdt_topdir pathtestdir
0:PATH_DIRS option
>File in upper dir