pwait(1): Import from FreeBSD, built without modification!
authorJohn Marino <draco@marino.st>
Fri, 11 Oct 2013 23:51:11 +0000 (01:51 +0200)
committerJohn Marino <draco@marino.st>
Fri, 11 Oct 2013 23:55:30 +0000 (01:55 +0200)
usr.bin/Makefile
usr.bin/pwait/Makefile [new file with mode: 0644]
usr.bin/pwait/pwait.1 [new file with mode: 0644]
usr.bin/pwait/pwait.c [new file with mode: 0644]

index 6ccee3b..70c75ae 100644 (file)
@@ -153,6 +153,7 @@ SUBDIR=     alias \
        pr \
        printenv \
        printf \
+       pwait \
        quota \
        rdist \
        relpath \
diff --git a/usr.bin/pwait/Makefile b/usr.bin/pwait/Makefile
new file mode 100644 (file)
index 0000000..1093d2c
--- /dev/null
@@ -0,0 +1,5 @@
+# $FreeBSD: head/bin/pwait/Makefile 199458 2009-11-17 22:47:20Z jilles $
+
+PROG=  pwait
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/pwait/pwait.1 b/usr.bin/pwait/pwait.1
new file mode 100644 (file)
index 0000000..093a677
--- /dev/null
@@ -0,0 +1,78 @@
+.\"
+.\" 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
+.\"    the following disclaimer in the documentation and/or
+.\"    other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+.\" CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+.\" PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+.\" 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 October 12, 2013
+.Dt PWAIT 1
+.Os
+.Sh NAME
+.Nm pwait
+.Nd wait for processes to terminate
+.Sh SYNOPSIS
+.Nm
+.Op Fl v
+.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 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 ,
+.Xr wait 1 ,
+.Xr kqueue 2
+.Sh NOTES
+.Nm
+is not a substitute for the
+.Xr wait 1
+builtin
+as it will not clean up any zombies or state in the parent process.
+.Sh HISTORY
+A
+.Nm
+command first appeared in SunOS 5.8.  It was introduced in 
+.Dx 3.5.
diff --git a/usr.bin/pwait/pwait.c b/usr.bin/pwait/pwait.c
new file mode 100644 (file)
index 0000000..97caebd
--- /dev/null
@@ -0,0 +1,144 @@
+/*-
+ * 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
+ *    the following disclaimer in the documentation and/or
+ *    other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * 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.c 245506 2013-01-16 18:15:25Z delphij $
+ */
+
+#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>
+#include <sysexits.h>
+#include <unistd.h>
+
+static void
+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 opt, nleft, n, i, duplicate, status;
+       long pid;
+       char *s, *end;
+
+       while ((opt = getopt(argc, argv, "v")) != -1) {
+               switch (opt) {
+               case 'v':
+                       verbose = 1;
+                       break;
+               default:
+                       usage();
+                       /* NOTREACHED */
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (argc == 0)
+               usage();
+
+       kq = kqueue();
+       if (kq == -1)
+               err(1, "kqueue");
+
+       e = malloc(argc * sizeof(struct kevent));
+       if (e == NULL)
+               err(1, "malloc");
+       nleft = 0;
+       for (n = 0; n < argc; n++) {
+               s = argv[n];
+               if (!strncmp(s, "/proc/", 6)) /* Undocumented Solaris compat */
+                       s += 6;
+               errno = 0;
+               pid = strtol(s, &end, 10);
+               if (pid < 0 || *end != '\0' || errno != 0) {
+                       warnx("%s: bad process id", s);
+                       continue;
+               }
+               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,
+                           0, NULL);
+                       if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1)
+                               warn("%ld", pid);
+                       else
+                               nleft++;
+               }
+       }
+
+       while (nleft > 0) {
+               n = kevent(kq, NULL, 0, e, nleft, NULL);
+               if (n == -1)
+                       err(1, "kevent");
+               if (verbose)
+                       for (i = 0; i < n; i++) {
+                               status = e[i].data;
+                               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);
+                       }
+               nleft -= n;
+       }
+
+       exit(EX_OK);
+}