autotools: add missing dist_noinst_DATA

[thirdparty/util-linux.git] / misc-utils / waitpid.c

diff --git a/misc-utils/waitpid.c b/misc-utils/waitpid.c
index 64f01373cc2f43f220b801613791639b446280e0..0a4e03d16714136e895be9f40ee712046b5fddbd 100644 (file)
--- a/misc-utils/waitpid.c
+++ b/misc-utils/waitpid.c
@@ -35,16 +35,16 @@
 #include "strutils.h"
 #include "exitcodes.h"
 #include "timeutils.h"
+#include "optutils.h"
 
 #define EXIT_TIMEOUT_EXPIRED 3
 
 #define TIMEOUT_SOCKET_IDX UINT64_MAX
 
-#define err_nosys(exitcode, ...) \
-       err(errno == ENOSYS ? EXIT_NOTSUPP : exitcode, __VA_ARGS__)
-
 static bool verbose = false;
 static struct timespec timeout;
+static bool allow_exited = false;
+static size_t count;
 
 static pid_t *parse_pids(size_t n_strings, char * const *strings)
 {
@@ -62,8 +62,14 @@ static int *open_pidfds(size_t n_pids, pid_t *pids)
 
        for (size_t i = 0; i < n_pids; i++) {
                pidfds[i] = pidfd_open(pids[i], 0);
-               if (pidfds[i] == -1)
+               if (pidfds[i] == -1) {
+                       if (allow_exited && errno == ESRCH) {
+                               if (verbose)
+                                       warnx(_("PID %d has exited, skipping"), pids[i]);
+                               continue;
+                       }
                        err_nosys(EXIT_FAILURE, _("could not open pid %u"), pids[i]);
+               }
        }
 
        return pidfds;
@@ -76,7 +82,7 @@ static int open_timeoutfd(void)
 
        if (!timeout.tv_sec && !timeout.tv_nsec)
                return -1;
-       
+
        timer.it_value = timeout;
 
        fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
@@ -90,8 +96,9 @@ static int open_timeoutfd(void)
 
 }
 
-static void add_listeners(int epll, size_t n_pids, int * const pidfds, int timeoutfd)
+static size_t add_listeners(int epll, size_t n_pids, int * const pidfds, int timeoutfd)
 {
+       size_t skipped = 0;
        struct epoll_event evt = {
                .events = EPOLLIN,
        };
@@ -103,16 +110,22 @@ static void add_listeners(int epll, size_t n_pids, int * const pidfds, int timeo
        }
 
        for (size_t i = 0; i < n_pids; i++) {
+               if (pidfds[i] == -1) {
+                       skipped++;
+                       continue;
+               }
                evt.data.u64 = i;
                if (epoll_ctl(epll, EPOLL_CTL_ADD, pidfds[i], &evt))
                        err_nosys(EXIT_FAILURE, _("could not add listener"));
        }
+
+       return n_pids - skipped;
 }
 
-static void wait_for_exits(int epll, size_t n_pids, pid_t * const pids,
+static void wait_for_exits(int epll, size_t active_pids, pid_t * const pids,
                           int * const pidfds)
 {
-       while (n_pids) {
+       while (active_pids) {
                struct epoll_event evt;
                int ret, fd;
 
@@ -130,10 +143,10 @@ static void wait_for_exits(int epll, size_t n_pids, pid_t * const pids,
                }
                if (verbose)
                        printf(_("PID %d finished\n"), pids[evt.data.u64]);
-               assert((size_t) ret <= n_pids);
+               assert((size_t) ret <= active_pids);
                fd = pidfds[evt.data.u64];
                epoll_ctl(epll, EPOLL_CTL_DEL, fd, NULL);
-               n_pids -= ret;
+               active_pids -= ret;
        }
 }
 
@@ -147,9 +160,11 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -v, --verbose           be more verbose\n"), out);
        fputs(_(" -t, --timeout=<timeout> wait at most timeout seconds\n"), out);
+       fputs(_(" -e, --exited            allow exited PIDs\n"), out);
+       fputs(_(" -c, --count=<count>     number of process exits to wait for\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       fprintf(out, USAGE_HELP_OPTIONS(23));
+       fprintf(out, USAGE_HELP_OPTIONS(25));
 
        fprintf(out, USAGE_MAN_TAIL("waitpid(1)"));
 
@@ -162,12 +177,22 @@ static int parse_options(int argc, char **argv)
        static const struct option longopts[] = {
                { "verbose", no_argument,       NULL, 'v' },
                { "timeout", required_argument, NULL, 't' },
+               { "exited",  no_argument,       NULL, 'e' },
+               { "count",   required_argument, NULL, 'c' },
                { "version", no_argument,       NULL, 'V' },
                { "help",    no_argument,       NULL, 'h' },
-               { NULL, 0, NULL, 0 },
+               { 0 }
        };
+       static const ul_excl_t excl[] = {       /* rows and cols in ASCII order */
+               { 'c', 'e' },
+               { 0 }
+       };
+       int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
+
+       while ((c = getopt_long (argc, argv, "vVht:c:e", longopts, NULL)) != -1) {
+
+               err_exclusive_options(c, longopts, excl, excl_st);
 
-       while ((c = getopt_long (argc, argv, "vVht:", longopts, NULL)) != -1) {
                switch (c) {
                case 'v':
                        verbose = true;
@@ -176,6 +201,13 @@ static int parse_options(int argc, char **argv)
                        strtotimespec_or_err(optarg, &timeout,
                                             _("Could not parse timeout"));
                        break;
+               case 'e':
+                       allow_exited = true;
+                       break;
+               case 'c':
+                       count = str2num_or_err(optarg, 10, _("Invalid count"),
+                                              1, INT64_MAX);
+                       break;
                case 'V':
                        print_version(EXIT_SUCCESS);
                case 'h':
@@ -190,9 +222,8 @@ static int parse_options(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-       int pid_idx, epoll;
-       size_t n_pids;
-       int *pidfds, timeoutfd;
+       int pid_idx, epoll, timeoutfd, *pidfds;
+       size_t n_pids, active_pids;
 
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
@@ -201,7 +232,11 @@ int main(int argc, char **argv)
        pid_idx = parse_options(argc, argv);
        n_pids = argc - pid_idx;
        if (!n_pids)
-               return EXIT_FAILURE;
+               errx(EXIT_FAILURE, _("no PIDs specified"));
+
+       if (count && count > n_pids)
+               errx(EXIT_FAILURE,
+                    _("can't want for %zu of %zu PIDs"), count, n_pids);
 
        pid_t *pids = parse_pids(argc - pid_idx, argv + pid_idx);
 
@@ -211,6 +246,8 @@ int main(int argc, char **argv)
        if (epoll == -1)
                err_nosys(EXIT_FAILURE, _("could not create epoll"));
 
-       add_listeners(epoll, n_pids, pidfds, timeoutfd);
-       wait_for_exits(epoll, n_pids, pids, pidfds);
+       active_pids = add_listeners(epoll, n_pids, pidfds, timeoutfd);
+       if (count)
+               active_pids = min(active_pids, count);
+       wait_for_exits(epoll, active_pids, pids, pidfds);
 }