diff options
| author | Bart Schaefer <schaefer@zsh.org> | 2023-03-14 20:51:15 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2023-03-14 20:51:15 -0700 |
| commit | 4b7a9fd0ecb750646cac76c41383f8391cd0fdd9 (patch) | |
| tree | bb034d4b2ed6171b91def37868f787c187a4d78a /Src/builtin.c | |
| parent | dd13048b3b8cf710f44424ce9fedc2b56c31fde3 (diff) | |
| download | zsh-4b7a9fd0ecb750646cac76c41383f8391cd0fdd9.tar.gz zsh-4b7a9fd0ecb750646cac76c41383f8391cd0fdd9.tar.xz zsh-4b7a9fd0ecb750646cac76c41383f8391cd0fdd9.zip | |
51573: additional "typset -p -m" fix for namespaces
The "-m pattern" option is supposed to enable printing namespaces, but that didn't work when combined with -p. The -p option could also cause an unset parameter to become set if a named reference pointed at it.
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index d99802f5f..f38a54936 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2236,12 +2236,12 @@ typeset_single(char *cname, char *pname, Param pm, int func, } on &= ~PM_LOCAL; if (!on && !roff && !ASG_VALUEP(asg)) { + int with_ns = OPT_ISSET(ops,'m') ? PRINT_WITH_NAMESPACE : 0; if (OPT_ISSET(ops,'p')) - paramtab->printnode(&pm->node, PRINT_TYPESET); + paramtab->printnode(&pm->node, PRINT_TYPESET|with_ns); else if (!OPT_ISSET(ops,'g') && (unset(TYPESETSILENT) || OPT_ISSET(ops,'m'))) - paramtab->printnode(&pm->node, - PRINT_INCLUDEVALUE|PRINT_WITH_NAMESPACE); + paramtab->printnode(&pm->node, PRINT_INCLUDEVALUE|with_ns); return pm; } if ((pm->node.flags & PM_RESTRICTED) && isset(RESTRICTED)) { @@ -2502,6 +2502,8 @@ typeset_single(char *cname, char *pname, Param pm, int func, "%s: inconsistent array element or slice assignment", pname); return NULL; } + } else if (!pm && OPT_ISSET(ops,'p')) { + return NULL; } /* * As we can hide existing parameters, we allow a name if |