From owner-svn-src-all@FreeBSD.ORG  Sat Jul 28 15:13:49 2012
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 0AD56106566B;
	Sat, 28 Jul 2012 15:13:49 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E98028FC15;
	Sat, 28 Jul 2012 15:13:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6SFDmbj038979;
	Sat, 28 Jul 2012 15:13:48 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6SFDm8A038977;
	Sat, 28 Jul 2012 15:13:48 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201207281513.q6SFDm8A038977@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 28 Jul 2012 15:13:48 +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: r238867 - head/bin/sh
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: Sat, 28 Jul 2012 15:13:49 -0000

Author: jilles
Date: Sat Jul 28 15:13:48 2012
New Revision: 238867
URL: http://svn.freebsd.org/changeset/base/238867

Log:
  sh: Do not ask for stopped/continued processes if we do not need them
  rather than retrying wait3 if they happen.

Modified:
  head/bin/sh/jobs.c

Modified: head/bin/sh/jobs.c
==============================================================================
--- head/bin/sh/jobs.c	Sat Jul 28 14:56:50 2012	(r238866)
+++ head/bin/sh/jobs.c	Sat Jul 28 15:13:48 2012	(r238867)
@@ -1025,17 +1025,16 @@ dowait(int block, struct job *job)
 	TRACE(("dowait(%d) called\n", block));
 	do {
 #if JOBS
-		wflags = WUNTRACED | WCONTINUED;
-#else
-		wflags = 0;
+		if (iflag)
+			wflags = WUNTRACED | WCONTINUED;
+		else
 #endif
+			wflags = 0;
 		if (block == 0)
 			wflags |= WNOHANG;
 		pid = wait3(&status, wflags, (struct rusage *)NULL);
 		TRACE(("wait returns %d, status=%d\n", (int)pid, status));
-	} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
-		 (pid > 0 && (WIFSTOPPED(status) || WIFCONTINUED(status)) &&
-		  !iflag));
+	} while (pid == -1 && errno == EINTR && breakwaitcmd == 0);
 	if (pid == -1 && errno == ECHILD && job != NULL)
 		job->state = JOBDONE;
 	if (breakwaitcmd != 0) {