From owner-freebsd-current@FreeBSD.ORG Wed Jul 4 15:23:13 2007 Return-Path: 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 6797816A46D; Wed, 4 Jul 2007 15:23:13 +0000 (UTC) (envelope-from ache@nagual.pp.ru) Received: from nagual.pp.ru (nagual.pp.ru [194.87.13.69]) by mx1.freebsd.org (Postfix) with ESMTP id C5C2713C44B; Wed, 4 Jul 2007 15:23:12 +0000 (UTC) (envelope-from ache@nagual.pp.ru) Received: from nagual.pp.ru (ache@localhost [127.0.0.1]) by nagual.pp.ru (8.14.1/8.14.1) with ESMTP id l64FNAfv032049; Wed, 4 Jul 2007 19:23:10 +0400 (MSD) (envelope-from ache@nagual.pp.ru) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nagual.pp.ru; s=default; t=1183562591; bh=CE+23sBTHeXP+Lhr6/ZHWdqlY5/g9AbPotm/S2B Uf7I=; l=1034; h=Received:Date:From:To:Cc:Subject:Message-ID: Mail-Followup-To:References:MIME-Version:Content-Type: Content-Disposition:In-Reply-To:User-Agent; b=RwtqubaaFAGfERsfZIef lbHfk0ZSCqc8vXbNb9buOT5n5Gnpq5/pdlLsfz/duPWFbqHyYP2jWxBeTePuPV0H+2X 4hzksag0KHlA2StImOc78+RnHfM11T9oQgQDB9lP20zFVhnWOmvbqi+GnRMHWhrB52q wkVKov5kaFPdBagaQ= Received: (from ache@localhost) by nagual.pp.ru (8.14.1/8.14.1/Submit) id l64FNAwe032048; Wed, 4 Jul 2007 19:23:10 +0400 (MSD) (envelope-from ache) Date: Wed, 4 Jul 2007 19:23:10 +0400 From: Andrey Chernov To: "Sean C. Farley" Message-ID: <20070704152310.GA31964@nagual.pp.ru> Mail-Followup-To: Andrey Chernov , "Sean C. Farley" , freebsd-current , Michal Mertl References: <1183557221.1799.16.camel@genius.i.cz> <20070704143642.GA31254@nagual.pp.ru> <20070704150312.GB31683@nagual.pp.ru> <20070704101026.O77978@thor.farley.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070704101026.O77978@thor.farley.org> User-Agent: Mutt/1.5.16 (2007-06-09) Cc: freebsd-current , Michal Mertl 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2007 15:23:13 -0000 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 "=" -- http://ache.pp.ru/