 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pwait.1,v 1.1 2015/03/02 21:43:39 christos Exp $
+.\"	$NetBSD: pwait.1,v 1.2 2015/03/02 21:53:48 christos Exp $
 .\"
 .\" Copyright (c) 2004-2009, Jilles Tjoelker
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with
 .\" or without modification, are permitted provided that the
 .\" following conditions are met:
 .\"
 .\" 1. Redistributions of source code must retain the above
 .\"    copyright notice, this list of conditions and the
 .\"    following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the
 .\"    above copyright notice, this list of conditions and
 @@ -23,44 +23,46 @@
 .\" COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
 .\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 .\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 .\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 .\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: head/bin/pwait/pwait.1 233648 2012-03-29 05:02:12Z eadler $
 .\"
-.Dd November 1, 2009
+.Dd March 2, 2015
 .Dt PWAIT 1
 .Os
 .Sh NAME
 .Nm pwait
 .Nd wait for processes to terminate
 .Sh SYNOPSIS
 .Nm
-.Op Fl v
+.Op Fl sv
 .Ar pid
 \&...
 .Sh DESCRIPTION
 The
 .Nm
 utility will wait until each of the given processes has terminated.
 .Pp
 The following option is available:
 .Bl -tag -width indent
 .It Fl s
 Exit with the status code of the first non-zero exit status pid.
 .It Fl v
 Print the exit status when each process terminates.
 .El
 .Sh DIAGNOSTICS
 The
 .Nm
 utility returns 0 on success, and >0 if an error occurs.
 .Pp
 Invalid pids elicit a warning message but are otherwise ignored.
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr pkill 1 ,
 .Xr ps 1 ,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pwait.c,v 1.1 2015/03/02 21:43:39 christos Exp $	*/
+/*	$NetBSD: pwait.c,v 1.2 2015/03/02 21:53:48 christos Exp $	*/
 /*-
  * Copyright (c) 2004-2009, Jilles Tjoelker
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with
  * or without modification, are permitted provided that the
  * following conditions are met:
+ *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the
  *    following disclaimer.
  * 2. Redistributions in binary form must reproduce the
 @@ -27,27 +27,27 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/bin/pwait/pwait.c 245506 2013-01-16 18:15:25Z delphij $");
 #endif
-__RCSID("$NetBSD: pwait.c,v 1.1 2015/03/02 21:43:39 christos Exp $");
+__RCSID("$NetBSD: pwait.c,v 1.2 2015/03/02 21:53:48 christos Exp $");
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -60,91 +60,100 @@ usage(void)
 	fprintf(stderr, "usage: pwait [-v] pid ...\n");
 	exit(EX_USAGE);
+}
 /*
  * pwait - wait for processes to terminate
  */
 int
 main(int argc, char *argv[])
+{
 	int kq;
 	struct kevent *e;
-	int verbose = 0;
+	int verbose = 0, childstatus = 0;
-	int opt, nleft, n, i, duplicate, status;
+	int opt, duplicate, status;
-	long pid;
+	size_t nleft, n, i;
 	pid_t pid;
 	char *s, *end;
-	while ((opt = getopt(argc, argv, "v")) != -1) {
+	while ((opt = getopt(argc, argv, "sv")) != -1) {
 		switch (opt) {
 		case 's':
 			childstatus = 1;
 			break;
 		case 'v':
 			verbose = 1;
 			break;
 		default:
 			usage();
 			/* NOTREACHED */
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc == 0)
 		usage();
 	kq = kqueue();
 	if (kq == -1)
-		err(1, "kqueue");
+		err(EXIT_FAILURE, "kqueue");
-	e = malloc(argc * sizeof(struct kevent));
+	e = malloc((size_t)argc * sizeof(*e));
 	if (e == NULL)
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 	nleft = 0;
-	for (n = 0; n < argc; n++) {
+	for (n = 0; n < (size_t)argc; n++) {
 		long pidl;
 		s = argv[n];
 		if (!strncmp(s, "/proc/", 6)) /* Undocumented Solaris compat */
 			s += 6;
 		errno = 0;
-		pid = strtol(s, &end, 10);
+		pidl = strtol(s, &end, 10);
-		if (pid < 0 || *end != '\0' || errno != 0) {
+		if (pidl < 0 || *end != '\0' || errno != 0) {
 			warnx("%s: bad process id", s);
 			continue;
+		}
 		pid = (pid_t)pidl;
 		duplicate = 0;
 		for (i = 0; i < nleft; i++)
 			if (e[i].ident == (uintptr_t)pid)
 				duplicate = 1;
 		if (!duplicate) {
-			EV_SET(e + nleft, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT,
+			EV_SET(e + nleft, (uintptr_t)pid, EVFILT_PROC, EV_ADD,
-, NULL);
+			    NOTE_EXIT, 0, NULL);
 			if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1)
-				warn("%ld", pid);
+				warn("%jd", (intmax_t)pid);
 			else
 				nleft++;
+		}
+	}
 	while (nleft > 0) {
-		n = kevent(kq, NULL, 0, e, nleft, NULL);
+		int rv = kevent(kq, NULL, 0, e, nleft, NULL);
-		if (n == -1)
+		if (rv == -1)
-			err(1, "kevent");
+			err(EXIT_FAILURE, "kevent");
-		if (verbose)
+		for (i = 0; i < n; i++) {
-			for (i = 0; i < n; i++) {
+			status = (int)e[i].data;
-				status = e[i].data;
+			if (verbose) {
 				if (WIFEXITED(status))
 					printf("%ld: exited with status %d.\n",
 					    (long)e[i].ident,
 					    WEXITSTATUS(status));
 				else if (WIFSIGNALED(status))
 					printf("%ld: killed by signal %d.\n",
 					    (long)e[i].ident,
 					    WTERMSIG(status));
 				else
 					printf("%ld: terminated.\n",
 					    (long)e[i].ident);
+			}
 			if (childstatus)
 				return status;
+		}
 		nleft -= n;
+	}
-	exit(EX_OK);
+	return EX_OK;
+}