X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=a59d7c39e5b283e71288ff68ed8c6b3f38d0630e;hp=b717ae60de1a663fe745dd84e229c8ac2f769c25;hb=1f5a5100f3bdfdaf9ef71b29931574b678ff0d82;hpb=4b718be86db37a37c83793ca410e8d9968e615f2

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index b717ae60d..a59d7c39e 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -36,7 +36,7 @@
 
 #include "udev.h"
 
-int udevadm_settle(struct udev *udev, int argc, char *argv[])
+static int adm_settle(struct udev *udev, int argc, char *argv[])
 {
 	static const struct option options[] = {
 		{ "seq-start", required_argument, NULL, 's' },
@@ -96,7 +96,9 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			       "  --exit-if-exists=<file> stop waiting if file exists\n"
 			       "  --quiet                 do not print list after timeout\n"
 			       "  --help\n\n");
-			exit(0);
+			exit(EXIT_SUCCESS);
+		default:
+			exit(EXIT_FAILURE);
 		}
 	}
 
@@ -136,7 +138,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 	if (getuid() == 0) {
 		struct udev_ctrl *uctrl;
 
-		uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+		uctrl = udev_ctrl_new(udev);
 		if (uctrl != NULL) {
 			if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
 				info(udev, "no connection to daemon\n");
@@ -183,8 +185,14 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		}
 
 		if (pfd[0].fd >= 0) {
-			/* wake up once every second, or whenever the queue file gets gets closed */
-			if (poll(pfd, 1, 1000) > 0 && pfd[0].revents & POLLIN) {
+			int delay;
+
+			if (exists != NULL || start > 0)
+				delay = 100;
+			else
+				delay = 1000;
+			/* wake up after delay, or immediately after the queue is rebuilt */
+			if (poll(pfd, 1, delay) > 0 && pfd[0].revents & POLLIN) {
 				char buf[sizeof(struct inotify_event) + PATH_MAX];
 
 				read(pfd[0].fd, buf, sizeof(buf));
@@ -219,3 +227,9 @@ out:
 	udev_queue_unref(udev_queue);
 	return rc;
 }
+
+const struct udevadm_cmd udevadm_settle = {
+	.name = "settle",
+	.cmd = adm_settle,
+	.help = "wait for the event queue to finish",
+};