From owner-freebsd-current@FreeBSD.ORG  Wed Jul  4 15:39:07 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@FreeBSD.org
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CFA5416A400
	for <freebsd-current@FreeBSD.org>; Wed,  4 Jul 2007 15:39:07 +0000 (UTC)
	(envelope-from scf@FreeBSD.org)
Received: from mail.farley.org (farley.org [67.64.95.201])
	by mx1.freebsd.org (Postfix) with ESMTP id 943F113C44B
	for <freebsd-current@FreeBSD.org>; Wed,  4 Jul 2007 15:39:07 +0000 (UTC)
	(envelope-from scf@FreeBSD.org)
Received: from thor.farley.org (thor.farley.org [192.168.1.5])
	by mail.farley.org (8.14.1/8.14.1) with ESMTP id l64FeGqA010596;
	Wed, 4 Jul 2007 10:40:16 -0500 (CDT) (envelope-from scf@FreeBSD.org)
Date: Wed, 4 Jul 2007 10:38:50 -0500 (CDT)
From: "Sean C. Farley" <scf@FreeBSD.org>
To: Andrey Chernov <ache@nagual.pp.ru>
In-Reply-To: <20070704152310.GA31964@nagual.pp.ru>
Message-ID: <20070704103822.H77978@thor.farley.org>
References: <1183557221.1799.16.camel@genius.i.cz>
	<20070704143642.GA31254@nagual.pp.ru>
	<20070704150312.GB31683@nagual.pp.ru>
	<20070704101026.O77978@thor.farley.org>
	<20070704152310.GA31964@nagual.pp.ru>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,BAYES_00
	autolearn=ham version=3.2.1
X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on mail.farley.org
Cc: freebsd-current <freebsd-current@FreeBSD.org>,
	Michal Mertl <mime@traveller.cz>
Subject: Re: Environment handling broken in /bin/sh with changes to
 {get,set,put}env()
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jul 2007 15:39:07 -0000

On Wed, 4 Jul 2007, Andrey Chernov wrote:

> On Wed, Jul 04, 2007 at 10:12:18AM -0500, Sean C. Farley wrote:
>> On Wed, 4 Jul 2007, Andrey Chernov wrote:
>>
>>> On Wed, Jul 04, 2007 at 06:36:42PM +0400, Andrey Chernov wrote:
>>>> 2) "s" may point to getenv()-provided value there. So just modifying
>>>> it directly followed by setenv() call will make things inconsistent.
>>>>
>>>> 3) In my version of patch there was savestr() which copy arg to avoid
>>>> this situation.
>>>>
>>>> Fix will be to restore var.c to mine variant 1.34
>>>
>>> You may also try this patch against var.c 1.36:
>>
>> Andrey, thank you.
>>
>> Sorry for the bug everyone.  Here is a patch that should fix it:
>> http://www.farley.org/freebsd/tmp/setenv/sh.patch
>
> Looks good excepting one moment. What happens if eqp == NULL here?
>
> +	if ((eqp = strchr(ss, '=')) != NULL)
> +		*eqp = '\0';
> +	if (set)
> +		(void) setenv(ss, eqp + 1, 1);
> +	else
> +		(void) unsetenv(ss);
>
> IMHO it should be changed to
>
> 	if (set && eqp != NULL)
>
> i.e. go to unsetenv() for values without "="

Good point.  I updated the patch.

Sean
-- 
scf@FreeBSD.org