svn commit: r199983 - in head: lib/libc/stdlib tools/regression/environ

[Andrey Chernov]

On Tue, Dec 01, 2009 at 05:04:31AM +0000, Brian Feldman wrote:
> -	if (environ == NULL || environ[0] == NULL)
> -		return (NULL);
> -	else if (envVars == NULL || environ != intEnviron)
> +	if (envVars == NULL)
>  		return (__findenv_environ(name, nameLen));
> -	else {
> -		envNdx = envVarsTotal - 1;
> -		return (__findenv(name, nameLen, &envNdx, true));
> -	}
> +
> +	/* Synchronize environment. */
> +	if (__merge_environ() == -1)
> +		return (NULL);
> +
> +	envNdx = envVarsTotal - 1;
> +	return (__findenv(name, nameLen, &envNdx, true));
>  }

__merge_environ() should be avoided here for speed reasons.

-- 
http://ache.pp.ru/