udevadm: control - add --exit

[elogind.git] / udev / udevadm-settle.c

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 4f422f90927d410b3287721245fed26444435840..b7852ff60ad146b1cc2c4b1922ed78f5c447271c 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -44,8 +44,6 @@ static void sig_handler(int signum)
        switch (signum) {
                case SIGALRM:
                        is_timeout = 1;
-               case SIGUSR1:
-                       ;
        }
 }
 
@@ -78,13 +76,11 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
-       sigaction(SIGUSR1, &act, NULL);
        sigemptyset(&mask);
-       sigaddset(&mask, SIGUSR1);
        sigaddset(&mask, SIGALRM);
        sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
-       while (1) {
+       for (;;) {
                int option;
                int seconds;
 
@@ -168,20 +164,17 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 
                uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
                if (uctrl != NULL) {
-                       sigset_t oldmask;
-
-                       sigemptyset(&mask);
-                       sigaddset(&mask, SIGUSR1);
-                       sigaddset(&mask, SIGALRM);
-                       sigprocmask(SIG_BLOCK, &mask, &oldmask);
-                       if (udev_ctrl_send_settle(uctrl) > 0)
-                               sigsuspend(&oldmask);
-                       sigprocmask(SIG_SETMASK, &oldmask, NULL);
+                       if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
+                               info(udev, "no connection to daemon\n");
+                               udev_ctrl_unref(uctrl);
+                               rc = 0;
+                               goto out;
+                       }
                        udev_ctrl_unref(uctrl);
                }
        }
 
-       while (1) {
+       for (;;) {
                struct stat statbuf;
                const struct timespec duration = { 0 , 1000 * 1000 * 1000 / LOOP_PER_SECOND };
 
@@ -223,7 +216,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                                       udev_list_entry_get_value(list_entry));
                }
        }
-
+out:
        udev_queue_unref(udev_queue);
        return rc;
 }