X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=682819201e46fc2f970626246c25b2608b7d1cec;hp=1c3c28176b98fcea62f9e3a723ae9fb02f3e37e0;hb=b02140b6bcd080c5fd60306a493447ce7afdad64;hpb=bb38678e3ccc02bcd970ccde3d8166a40edf92d3

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 1c3c28176..682819201 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2006-2009 Kay Sievers <kay@vrfy.org>
  * Copyright (C) 2009 Canonical Ltd.
  * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
  *
@@ -36,9 +36,9 @@
 #define DEFAULT_TIMEOUT			180
 #define LOOP_PER_SECOND			20
 
-static int volatile is_timeout;
+static volatile sig_atomic_t is_timeout;
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
@@ -54,6 +54,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		{ "seq-start", required_argument, NULL, 's' },
 		{ "seq-end", required_argument, NULL, 'e' },
 		{ "timeout", required_argument, NULL, 't' },
+		{ "exit-if-exists", required_argument, NULL, 'E' },
 		{ "quiet", no_argument, NULL, 'q' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
@@ -61,16 +62,17 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 	unsigned long long start = 0;
 	unsigned long long end = 0;
 	int quiet = 0;
-	int timeout = 0;
+	const char *exists = NULL;
+	int timeout = DEFAULT_TIMEOUT;
 	struct sigaction act;
 	struct udev_queue *udev_queue = NULL;
-	int rc = 0;
+	int rc = 1;
 
 	dbg(udev, "version %s\n", VERSION);
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
-	act.sa_handler = (void (*)(int)) sig_handler;
+	act.sa_handler = sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGALRM, &act, NULL);
@@ -80,7 +82,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		int option;
 		int seconds;
 
-		option = getopt_long(argc, argv, "s:e:t:qh", options, NULL);
+		option = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -102,25 +104,29 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		case 'q':
 			quiet = 1;
 			break;
+		case 'E':
+			exists = optarg;
+			break;
 		case 'h':
 			printf("Usage: udevadm settle OPTIONS\n"
-			       "  --timeout=<seconds>   maximum time to wait for events\n"
-			       "  --seq-start=<seqnum>  first seqnum to wait for\n"
-			       "  --seq-end=<seqnum>    last seqnum to wait for\n"
-			       "  --quiet               do not print list after timeout\n"
+			       "  --timeout=<seconds>     maximum time to wait for events\n"
+			       "  --seq-start=<seqnum>    first seqnum to wait for\n"
+			       "  --seq-end=<seqnum>      last seqnum to wait for\n"
+			       "  --exit-if-exists=<file> stop waiting if file exists\n"
+			       "  --quiet                 do not print list after timeout\n"
 			       "  --help\n\n");
-			goto exit;
+			exit(0);
 		}
 	}
 
 	if (timeout > 0)
 		alarm(timeout);
 	else
-		alarm(DEFAULT_TIMEOUT);
+		is_timeout = 1;
 
 	udev_queue = udev_queue_new(udev);
 	if (udev_queue == NULL)
-		goto exit;
+		exit(2);
 
 	if (start > 0) {
 		unsigned long long kernel_seq;
@@ -167,29 +173,36 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			sigprocmask(SIG_BLOCK, &mask, &oldmask);
 			if (udev_ctrl_send_settle(uctrl) > 0)
 				sigsuspend(&oldmask);
+			sigprocmask(SIG_SETMASK, &oldmask, NULL);
 			udev_ctrl_unref(uctrl);
 		}
 	}
 
-	while (!is_timeout) {
-		/* exit if queue is empty */
-		if (udev_queue_get_queue_is_empty(udev_queue))
+	while (1) {
+		struct stat statbuf;
+
+		if (exists != NULL && stat(exists, &statbuf) == 0) {
+			rc = 0;
 			break;
+		}
 
-		/* if asked for, wait for a specific sequence of events */
 		if (start > 0) {
-			unsigned long long seq;
-			int finished;
-
-			finished = 0;
-			for (seq = start; seq <= end; seq++) {
-				finished  = udev_queue_get_seqnum_is_finished(udev_queue, seq);
-				if (!finished)
-					break;
+			/* if asked for, wait for a specific sequence of events */
+			if (udev_queue_get_seqnum_sequence_is_finished(udev_queue, start, end) == 1) {
+				rc = 0;
+				break;
 			}
-			if (finished)
+		} else {
+			/* exit if queue is empty */
+			if (udev_queue_get_queue_is_empty(udev_queue)) {
+				rc = 0;
 				break;
+			}
 		}
+
+		if (is_timeout)
+			break;
+
 		usleep(1000 * 1000 / LOOP_PER_SECOND);
 	}
 
@@ -197,7 +210,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 	if (is_timeout) {
 		struct udev_list_entry *list_entry;
 
-		if (!quiet) {
+		if (!quiet && udev_queue_get_queued_list_entry(udev_queue) != NULL) {
 			info(udev, "timeout waiting for udev queue\n");
 			printf("\nudevadm settle - timeout of %i seconds reached, the event queue contains:\n", timeout);
 			udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
@@ -205,9 +218,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 				       udev_list_entry_get_name(list_entry),
 				       udev_list_entry_get_value(list_entry));
 		}
-		rc = 1;
 	}
-exit:
+
 	udev_queue_unref(udev_queue);
 	return rc;
 }