mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-27 02:01:09 +01:00
Code Releases Activity

10743: fix replenv() of imported special parameters

Browse source
This commit is contained in:
Peter Stephenson 2000-04-13 17:57:45 +00:00
parent cf92384eac
commit 6372332a92
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2000-04-13 Peter Stephenson <pws@cambridgesiliconradio.com> 2000-04-13 Peter Stephenson <pws@cambridgesiliconradio.com>
* 10743: Src/params.c: replenv() failed importing special params
at start up because it was using the wrong environment block.
* 10738: Doc/Zsh/builtins.yo, Doc/Zsh/params.yo, Src/builtin.c, * 10738: Doc/Zsh/builtins.yo, Doc/Zsh/params.yo, Src/builtin.c,
Src/params.c: local parameters can be exported; typeset +g -x Src/params.c: local parameters can be exported; typeset +g -x
and local -x work in a natural way; currently typeset -g still and local -x work in a natural way; currently typeset -g still

6
Src/params.c
View file

@ -454,6 +454,7 @@ createparamtable(void)
{ {
Param ip, pm; Param ip, pm;
char **new_environ, **envp, **envp2, **sigptr, **t; char **new_environ, **envp, **envp2, **sigptr, **t;
char **old_environ = environ;
char buf[50], *str, *iname; char buf[50], *str, *iname;
int num_env, oae = opts[ALLEXPORT]; int num_env, oae = opts[ALLEXPORT];
#ifdef HAVE_UNAME #ifdef HAVE_UNAME
@ -516,9 +517,12 @@ createparamtable(void)
pm->flags |= PM_EXPORTED; pm->flags |= PM_EXPORTED;
pm->env = *envp++ = ztrdup(*envp2); pm->env = *envp++ = ztrdup(*envp2);
*envp = NULL; *envp = NULL;
if (pm->flags & PM_SPECIAL) if (pm->flags & PM_SPECIAL) {
environ = new_environ;
pm->env = replenv(pm->env, getsparam(pm->nam), pm->env = replenv(pm->env, getsparam(pm->nam),
pm->flags); pm->flags);
environ = old_environ;
}
} }
} }
*str = '='; *str = '=';