X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsettle.c;h=4b66f89cd64034a004a46c7626428a291b8ece34;hp=b38968e7dfa644b6b08501a771fdafd945041bee;hb=c70560feef0eb61a150cd2f956f0beead4313ffe;hpb=e3396a2d383cf19092911a4643e092f6a825b2aa

diff --git a/udevsettle.c b/udevsettle.c
index b38968e7d..4b66f89cd 100644
--- a/udevsettle.c
+++ b/udevsettle.c
@@ -1,6 +1,4 @@
 /*
- * udevsettle.c
- *
  * Copyright (C) 2006 Kay Sievers <kay@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -27,6 +25,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <syslog.h>
+#include <getopt.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -36,22 +35,7 @@
 #define DEFAULT_TIMEOUT			180
 #define LOOP_PER_SECOND			20
 
-
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
-	va_list args;
-
-	if (priority > udev_log_priority)
-		return;
-
-	va_start(args, format);
-	vsyslog(priority, format, args);
-	va_end(args);
-}
-#endif
-
-int main(int argc, char *argv[], char *envp[])
+int udevsettle(int argc, char *argv[], char *envp[])
 {
 	char queuename[PATH_SIZE];
 	char filename[PATH_SIZE];
@@ -62,33 +46,37 @@ int main(int argc, char *argv[], char *envp[])
 	ssize_t len;
 	int timeout = DEFAULT_TIMEOUT;
 	int loop;
-	int i;
+	static const struct option options[] = {
+		{ "timeout", 1, NULL, 't' },
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
+	int option;
 	int rc = 1;
+	int seconds;
 
 	logging_init("udevsettle");
 	udev_config_init();
-	dbg("version %s", UDEV_VERSION);
+	dbg("version %s\n", UDEV_VERSION);
 	sysfs_init();
 
-	for (i = 1 ; i < argc; i++) {
-		char *arg = argv[i];
-
-		if (strncmp(arg, "--timeout=", 10) == 0) {
-			char *str = &arg[10];
-			int seconds;
+	while (1) {
+		option = getopt_long(argc, argv, "t:h", options, NULL);
+		if (option == -1)
+			break;
 
-			seconds = atoi(str);
+		switch (option) {
+		case 't':
+			seconds = atoi(optarg);
 			if (seconds > 0)
 				timeout = seconds;
 			else
 				fprintf(stderr, "invalid timeout value\n");
-			dbg("timeout=%i", timeout);
-		} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
-			printf("Usage: udevsettle [--help] [--timeout=<seconds>]\n");
+			dbg("timeout=%i\n", timeout);
+			break;
+		case 'h':
+			printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
 			goto exit;
-		} else {
-			fprintf(stderr, "unrecognized option '%s'\n", arg);
-			err("unrecognized option '%s'\n", arg);
 		}
 	}
 
@@ -102,19 +90,19 @@ int main(int argc, char *argv[], char *envp[])
 			struct stat statbuf;
 
 			if (stat(queuename, &statbuf) < 0) {
-				info("queue is empty");
+				info("queue is empty\n");
 				break;
 			}
 			usleep(1000 * 1000 / LOOP_PER_SECOND);
 		}
 		if (loop <= 0) {
-			info("timeout waiting for queue");
+			info("timeout waiting for queue\n");
 			goto exit;
 		}
 
-		/* read current kernel seqnum */
-		strlcpy(filename, sysfs_path, sizeof(filename));
-		strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+		/* read current udev seqnum */
+		strlcpy(filename, udev_root, sizeof(filename));
+		strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
 		fd = open(filename, O_RDONLY);
 		if (fd < 0)
 			goto exit;
@@ -123,12 +111,12 @@ int main(int argc, char *argv[], char *envp[])
 		if (len <= 0)
 			goto exit;
 		seqnum[len] = '\0';
-		seq_kernel = strtoull(seqnum, NULL, 10);
-		info("kernel seqnum = %llu", seq_kernel);
+		seq_udev = strtoull(seqnum, NULL, 10);
+		info("udev seqnum = %llu\n", seq_udev);
 
-		/* read current udev seqnum */
-		strlcpy(filename, udev_root, sizeof(filename));
-		strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+		/* read current kernel seqnum */
+		strlcpy(filename, sysfs_path, sizeof(filename));
+		strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
 		fd = open(filename, O_RDONLY);
 		if (fd < 0)
 			goto exit;
@@ -137,17 +125,17 @@ int main(int argc, char *argv[], char *envp[])
 		if (len <= 0)
 			goto exit;
 		seqnum[len] = '\0';
-		seq_udev = strtoull(seqnum, NULL, 10);
-		info("udev seqnum = %llu", seq_udev);
+		seq_kernel = strtoull(seqnum, NULL, 10);
+		info("kernel seqnum = %llu\n", seq_kernel);
 
 		/* make sure all kernel events have arrived in the queue */
 		if (seq_udev >= seq_kernel) {
-			info("queue is empty and no pending events left");
+			info("queue is empty and no pending events left\n");
 			rc = 0;
 			goto exit;
 		}
 		usleep(1000 * 1000 / LOOP_PER_SECOND);
-		info("queue is empty, but events still pending");
+		info("queue is empty, but events still pending\n");
 	}
 
 exit: