From owner-p4-projects@FreeBSD.ORG  Sat Sep  4 22:25:59 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7DE8510657AD; Sat,  4 Sep 2010 22:25:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2463110656DB
	for <perforce@FreeBSD.org>; Sat,  4 Sep 2010 22:25:59 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 11AC58FC14
	for <perforce@FreeBSD.org>; Sat,  4 Sep 2010 22:25:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o84MPwwq058378
	for <perforce@FreeBSD.org>; Sat, 4 Sep 2010 22:25:58 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o84MPwf8058375
	for perforce@freebsd.org; Sat, 4 Sep 2010 22:25:58 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 4 Sep 2010 22:25:58 GMT
Message-Id: <201009042225.o84MPwf8058375@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 183348 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Sep 2010 22:25:59 -0000

http://p4web.freebsd.org/@@183348?ac=10

Change 183348 by gcooper@gcooper-bayonetta on 2010/09/04 22:25:30

	IFC again.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#6 integrate

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.85 2010/08/13 20:29:43 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.86 2010/09/04 21:23:46 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -995,7 +995,7 @@
 	goto out;
 
 parent:	/* parent process gets here (if we forked) */
-	if (mode == 0) {	/* argument to fork */
+	if (mode == FORK_FG) {	/* argument to fork */
 		INTOFF;
 		exitstatus = waitforjob(jp, &realstatus);
 		INTON;
@@ -1003,7 +1003,7 @@
 			evalskip = SKIPBREAK;
 			skipcount = loopnest;
 		}
-	} else if (mode == 2) {
+	} else if (mode == FORK_NOJOB) {
 		backcmd->fd = pip[0];
 		close(pip[1]);
 		backcmd->jp = jp;