From owner-svn-src-all@FreeBSD.ORG  Fri Nov 27 13:05:14 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0AA7106566C;
	Fri, 27 Nov 2009 13:05:14 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6994A8FC0C;
	Fri, 27 Nov 2009 13:05:14 +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 nARD5EUO020426;
	Fri, 27 Nov 2009 13:05:14 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nARD5ERs020424;
	Fri, 27 Nov 2009 13:05:14 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200911271305.nARD5ERs020424@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 27 Nov 2009 13:05:14 +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: r199862 - head/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Nov 2009 13:05:14 -0000

Author: ed
Date: Fri Nov 27 13:05:14 2009
New Revision: 199862
URL: http://svn.freebsd.org/changeset/base/199862

Log:
  Properly use the envp argument in execvPe().
  
  execvPe() is called by _execvpe(), which we added to implement
  posix_spawnp(). We just took execvP() and added the envp argument.
  Unfortunately we forgot to change the implementation to use envp over
  environ.
  
  This fixes the following piece of code:
  
  | char * const arg[2] = { "env", NULL };
  | char * const env[2] = { "FOO=BAR", NULL };
  | posix_spawnp(NULL, "/usr/bin/env", NULL, NULL, arg, env);
  
  MFC after:	2 weeks

Modified:
  head/lib/libc/gen/exec.c

Modified: head/lib/libc/gen/exec.c
==============================================================================
--- head/lib/libc/gen/exec.c	Fri Nov 27 10:55:28 2009	(r199861)
+++ head/lib/libc/gen/exec.c	Fri Nov 27 13:05:14 2009	(r199862)
@@ -209,7 +209,7 @@ execvPe(name, path, argv, envp)
 		bcopy(name, buf + lp + 1, ln);
 		buf[lp + ln + 1] = '\0';
 
-retry:		(void)_execve(bp, argv, environ);
+retry:		(void)_execve(bp, argv, envp);
 		switch (errno) {
 		case E2BIG:
 			goto done;
@@ -228,7 +228,7 @@ retry:		(void)_execve(bp, argv, environ)
 			memp[0] = "sh";
 			memp[1] = bp;
 			bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
-			(void)_execve(_PATH_BSHELL, memp, environ);
+			(void)_execve(_PATH_BSHELL, memp, envp);
 			goto done;
 		case ENOMEM:
 			goto done;