Module Name: src
Committed By: christos
Date: Wed Apr 6 04:09:10 UTC 2016
Modified Files:
src/lib/libc/gen: waitid.c
src/lib/libc/sys: wait.2
Log Message:
revert part of previous; not needed.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/waitid.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/sys/wait.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/waitid.c
diff -u src/lib/libc/gen/waitid.c:1.3 src/lib/libc/gen/waitid.c:1.4
--- src/lib/libc/gen/waitid.c:1.3 Tue Apr 5 23:50:03 2016
+++ src/lib/libc/gen/waitid.c Wed Apr 6 00:09:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: waitid.c,v 1.3 2016/04/06 03:50:03 christos Exp $ */
+/* $NetBSD: waitid.c,v 1.4 2016/04/06 04:09:10 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: waitid.c,v 1.3 2016/04/06 03:50:03 christos Exp $");
+__RCSID("$NetBSD: waitid.c,v 1.4 2016/04/06 04:09:10 christos Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -57,8 +57,6 @@ waitid(idtype_t idtype, id_t id, siginfo
memset(info, 0, sizeof(*info));
/*FALLTHROUGH*/
default:
- if (info != NULL && info->si_signo != 0)
- info->si_signo = SIGCHLD;
return 0;
}
}
Index: src/lib/libc/sys/wait.2
diff -u src/lib/libc/sys/wait.2:1.30 src/lib/libc/sys/wait.2:1.31
--- src/lib/libc/sys/wait.2:1.30 Tue Apr 5 23:50:03 2016
+++ src/lib/libc/sys/wait.2 Wed Apr 6 00:09:10 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wait.2,v 1.30 2016/04/06 03:50:03 christos Exp $
+.\" $NetBSD: wait.2,v 1.31 2016/04/06 04:09:10 christos Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -435,12 +435,7 @@ structure is returned with the
.Fa si_signo
field set to
.Dv SIGCHLD
-for
-.Fn waitid
-as required by POSIX and to the delivering signal
-for
-.Fn wait6 .
-The
+and the
.Fa si_pid
field set to the process ID of the process reporting status.
For the exited process, the
