From owner-svn-src-all@FreeBSD.ORG  Fri Nov 16 06:32:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 67FCE226;
 Fri, 16 Nov 2012 06:32:39 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4DE9E8FC08;
 Fri, 16 Nov 2012 06:32:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAG6Wdhf032965;
 Fri, 16 Nov 2012 06:32:39 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAG6WdAo032964;
 Fri, 16 Nov 2012 06:32:39 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201211160632.qAG6WdAo032964@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 16 Nov 2012 06:32:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243136 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 16 Nov 2012 06:32:39 -0000

Author: kib
Date: Fri Nov 16 06:32:38 2012
New Revision: 243136
URL: http://svnweb.freebsd.org/changeset/base/243136

Log:
  Restore the proper handling of the pid 0 for waitpid(2).
  Fix the style around.
  
  Reported and reviewed by:	bde (previous version)
  MFC after:	28 days

Modified:
  head/sys/kern/kern_exit.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Fri Nov 16 06:29:52 2012	(r243135)
+++ head/sys/kern/kern_exit.c	Fri Nov 16 06:32:38 2012	(r243136)
@@ -1024,6 +1024,7 @@ kern_wait(struct thread *td, pid_t pid, 
     struct rusage *rusage)
 {
 	struct __wrusage wru, *wrup;
+	struct proc *q;
 	idtype_t idtype;
 	id_t id;
 	int ret;
@@ -1031,12 +1032,16 @@ kern_wait(struct thread *td, pid_t pid, 
 	if (pid == WAIT_ANY) {
 		idtype = P_ALL;
 		id = 0;
-	}
-	else if (pid <= 0) {
+	} else if (pid == WAIT_MYPGRP) {
+		idtype = P_PGID;
+		q = td->td_proc;
+		PROC_LOCK(q);
+		id = (id_t)q->p_pgid;
+		PROC_UNLOCK(q);
+	} else if (pid < 0) {
 		idtype = P_PGID;
 		id = (id_t)-pid;
-	}
-	else {
+	} else {
 		idtype = P_PID;
 		id = (id_t)pid;
 	}