diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-04 12:02:04 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-04 12:02:04 +0000 |
| commit | 8488dcb806f8aaa3009691bcd43f0ac7c787c1ad (patch) | |
| tree | 821e3a7aed75481c82b8686b6aec7f24640d7bad /Src/params.c | |
| parent | c15ef20346e4b760c7710b64a62db794abf86229 (diff) | |
| download | zsh-8488dcb806f8aaa3009691bcd43f0ac7c787c1ad.tar.gz zsh-8488dcb806f8aaa3009691bcd43f0ac7c787c1ad.tar.xz zsh-8488dcb806f8aaa3009691bcd43f0ac7c787c1ad.zip | |
keep association elements from being exported
Diffstat (limited to 'Src/params.c')
| -rw-r--r-- | Src/params.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Src/params.c b/Src/params.c index a7444bfd1..3179fc6a7 100644 --- a/Src/params.c +++ b/Src/params.c @@ -617,6 +617,9 @@ createparam(char *name, int flags) { Param pm, oldpm; + if (paramtab != realparamtab) + flags = (flags & ~PM_EXPORTED) | PM_HASHELEM; + if (name != nulstring) { oldpm = (Param) (paramtab == realparamtab ? gethashnode2(paramtab, name) : @@ -646,7 +649,7 @@ createparam(char *name, int flags) paramtab->addnode(paramtab, ztrdup(name), pm); } - if (isset(ALLEXPORT) && !oldpm) + if (isset(ALLEXPORT) && !oldpm && !(flags & PM_HASHELEM)) flags |= PM_EXPORTED; } else { pm = (Param) zhalloc(sizeof *pm); @@ -1520,7 +1523,7 @@ setstrvalue(Value v, char *val) break; } if ((!v->pm->env && !(v->pm->flags & PM_EXPORTED) && - !(isset(ALLEXPORT) && !v->pm->old)) || + !(isset(ALLEXPORT) && !v->pm->old && !(v->pm->flags & PM_HASHELEM))) || (v->pm->flags & PM_ARRAY) || v->pm->ename) return; if (PM_TYPE(v->pm->flags) == PM_INTEGER) @@ -2742,7 +2745,7 @@ arrfixenv(char *s, char **t) */ if (t == path) cmdnamtab->emptytable(cmdnamtab); - if (isset(ALLEXPORT) ? !!pm->old : pm->level) + if ((pm->flags & PM_HASHELEM) || (isset(ALLEXPORT) ? !!pm->old : pm->level)) return; u = t ? zjoin(t, ':', 1) : ""; len_s = strlen(s); |