Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 23:47:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefer the first, not last, of any env var duplicates

Browse source 
If envp contains duplicate environment variables, use the
first value, not the last value. Fixes #2784.
This commit is contained in:
ridiculousfish 2016-03-05 19:02:50 -08:00
parent 1e7c3fe709
commit 3044697baa
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/env.cpp
View file

@ -449,12 +449,16 @@ void env_init(const struct config_paths_t *paths /* or NULL */)
is to insert valid data
*/
/*
Import environment variables
*/
for (char **p = (environ ? environ : __environ); p && *p; p++)
/* Import environment variables. Walk backwards so that the first one out of any duplicates wins (#2784) */
const char * const * envp = (environ ? environ : __environ);
size_t i = 0;
while (envp && envp[i])
{
const wcstring key_and_val = str2wcstring(*p); //like foo=bar
i++;
}
while (i--)
{
const wcstring key_and_val = str2wcstring(envp[i]); //like foo=bar
size_t eql = key_and_val.find(L'=');
if (eql == wcstring::npos)
{