X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=d5e90b02c650c05beab2499eedb90fc6853f9263;hp=7b3ea6311d4c2a2178464affa0f54cd53b70cc8b;hb=98d8d24bcc668022857e1b4852ac37ce4400ddf8;hpb=285e2a24f67b1c09d7b4c54587802fc0a9d623eb

diff --git a/udevtest.c b/udevtest.c
index 7b3ea6311..d5e90b02c 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -32,22 +32,6 @@
 #include "udev.h"
 #include "udev_rules.h"
 
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
-	va_list args;
-
-	if (priority > udev_log_priority)
-		return;
-
-	va_start(args, format);
-	vprintf(format, args);
-	va_end(args);
-	printf("\n");
-}
-#endif
-
 static int import_uevent_var(const char *devpath)
 {
 	char path[PATH_SIZE];
@@ -78,7 +62,7 @@ static int import_uevent_var(const char *devpath)
 		if (next == NULL)
 			goto out;
 		next[0] = '\0';
-		info("import into environment: '%s'", key);
+		info("import into environment: '%s'\n", key);
 		putenv(key);
 		key = &next[1];
 	}
@@ -87,7 +71,7 @@ out:
 	return rc;
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevtest(int argc, char *argv[], char *envp[])
 {
 	int force = 0;
 	const char *action = "add";
@@ -107,7 +91,7 @@ int main(int argc, char *argv[], char *envp[])
 		{}
 	};
 
-	info("version %s", UDEV_VERSION);
+	info("version %s\n", UDEV_VERSION);
 	udev_config_init();
 	if (udev_log_priority < LOG_INFO) {
 		char priority[32];
@@ -124,7 +108,7 @@ int main(int argc, char *argv[], char *envp[])
 		if (option == -1)
 			break;
 
-		dbg("option '%c'", option);
+		dbg("option '%c'\n", option);
 		switch (option) {
 		case 'a':
 			action = optarg;
@@ -136,7 +120,7 @@ int main(int argc, char *argv[], char *envp[])
 			force = 1;
 			break;
 		case 'h':
-			printf("Usage: udevtest OPTIONS <devpath>\n"
+			printf("Usage: udevadm test OPTIONS <devpath>\n"
 			       "  --action=<string>     set action string\n"
 			       "  --subsystem=<string>  set subsystem string\n"
 			       "  --force               don't skip node/link creation\n"
@@ -197,8 +181,12 @@ int main(int argc, char *argv[], char *envp[])
 	setenv("ACTION", udev->action, 1);
 	import_uevent_var(udev->dev->devpath);
 
-	info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
+	info("looking at device '%s' from subsystem '%s'\n", udev->dev->devpath, udev->dev->subsystem);
 	retval = udev_device_event(&rules, udev);
+
+	if (udev->event_timeout >= 0)
+		info("custom event timeout: %i\n", udev->event_timeout);
+
 	if (retval == 0 && !udev->ignore_device && udev_run) {
 		struct name_entry *name_loop;
 
@@ -207,7 +195,7 @@ int main(int argc, char *argv[], char *envp[])
 
 			strlcpy(program, name_loop->name, sizeof(program));
 			udev_rules_apply_format(udev, program, sizeof(program));
-			info("run: '%s'", program);
+			info("run: '%s'\n", program);
 		}
 	}
 	udev_device_cleanup(udev);