Environment handling broken in /bin/sh with changes to t,set,put}env()

[Sean C. Farley]

On Sat, 14 Jul 2007, Andrey Chernov wrote:

> On Sat, Jul 14, 2007 at 10:25:03AM -0500, Sean C. Farley wrote:

*snip*

>> The new patch is here:
>> http://www.farley.org/freebsd/tmp/setenv/clearenv/patch2
>
> Ok.
>
> BTW, I see no needs to duplicate code here:
>
>        rtrnVal = __rebuild_environ(envVarsTotal);
>        if (rtrnVal == -1) {
>                savedErrno = errno;
>                __clean_env(true);
>                errno = savedErrno;
>        }
>
>        return (rtrnVal);
>
> Failure:
>        savedErrno = errno;
>        __clean_env(true);
>        errno = savedErrno;
>
>        return (-1);
>
> instead of simple:
>
>        rtrnVal = __rebuild_environ(envVarsTotal);
>        if (rtrnVal == -1)
> 		goto Failure;
>
> like before in this function.

True.  I also changed it to:

     if (__rebuild_environ(envVarsTotal) == 0)
         return (0);

to get rid of the rtrnVal variable.

Sean
-- 
scf at FreeBSD.org