From owner-svn-src-head@FreeBSD.ORG  Sun Dec  6 23:27:25 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C8541065693;
	Sun,  6 Dec 2009 23:27:25 +0000 (UTC) (envelope-from scf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BA278FC0A;
	Sun,  6 Dec 2009 23:27:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6NROqR034891;
	Sun, 6 Dec 2009 23:27:24 GMT (envelope-from scf@svn.freebsd.org)
Received: (from scf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB6NROLv034889;
	Sun, 6 Dec 2009 23:27:24 GMT (envelope-from scf@svn.freebsd.org)
Message-Id: <200912062327.nB6NROLv034889@svn.freebsd.org>
From: Sean Farley <scf@FreeBSD.org>
Date: Sun, 6 Dec 2009 23:27:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200191 - head/lib/libc/stdlib
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Dec 2009 23:27:25 -0000

Author: scf
Date: Sun Dec  6 23:27:24 2009
New Revision: 200191
URL: http://svn.freebsd.org/changeset/base/200191

Log:
  Change the behavior of setenv(), putenv() and unsetenv() to continue parsing
  instead of returning an error if a corrupt (not a "name=value" string) entry
  in the environ array is detected when (re)-building the internal
  environment.  This should prevent applications or libraries from
  experiencing issues arising from the expectation that these calls will
  complete even with corrupt entries.  The behavior is now as it was prior to
  7.0.
  
  Reviewed by:	jilles
  MFC after:	1 week

Modified:
  head/lib/libc/stdlib/getenv.c

Modified: head/lib/libc/stdlib/getenv.c
==============================================================================
--- head/lib/libc/stdlib/getenv.c	Sun Dec  6 23:05:17 2009	(r200190)
+++ head/lib/libc/stdlib/getenv.c	Sun Dec  6 23:27:24 2009	(r200191)
@@ -361,8 +361,7 @@ __build_env(void)
 		} else {
 			__env_warnx(CorruptEnvValueMsg, envVars[envNdx].name,
 			    strlen(envVars[envNdx].name));
-			errno = EFAULT;
-			goto Failure;
+			continue;
 		}
 
 		/*
@@ -377,8 +376,7 @@ __build_env(void)
 		    false) == NULL) {
 			__env_warnx(CorruptEnvFindMsg, envVars[envNdx].name,
 			    nameLen);
-			errno = EFAULT;
-			goto Failure;
+			continue;
 		}
 		envVars[activeNdx].active = true;
 	}
@@ -560,8 +558,7 @@ __merge_environ(void)
 				if ((equals = strchr(*env, '=')) == NULL) {
 					__env_warnx(CorruptEnvValueMsg, *env,
 					    strlen(*env));
-					errno = EFAULT;
-					return (-1);
+					continue;
 				}
 				if (__setenv(*env, equals - *env, equals + 1,
 				    1) == -1)