X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test-udev.c;h=4ac2d5a8891cedb53386de53358e42bd611c804f;hp=0c25778aa68d5ba1c96e3b43e6e765bcb00a6aa0;hb=941d40a0747a4cbbb306ba597ff02bbbbb49df96;hpb=274da2b23d37f2dd174f765e9cfcc485e4a5a898

diff --git a/test-udev.c b/test-udev.c
index 0c25778aa..4ac2d5a88 100644
--- a/test-udev.c
+++ b/test-udev.c
@@ -90,10 +90,10 @@ int main(int argc, char *argv[], char *envp[])
 
 	logging_init("udev");
 	if (devnull < 0)
-		err("open /dev/null failed: %s", strerror(errno));
+		err("open /dev/null failed: %s\n", strerror(errno));
 	udev_config_init();
 	selinux_init();
-	dbg("version %s", UDEV_VERSION);
+	dbg("version %s\n", UDEV_VERSION);
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
@@ -105,7 +105,7 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(UDEV_ALARM_TIMEOUT);
+	alarm(UDEV_EVENT_TIMEOUT);
 
 	action = getenv("ACTION");
 	devpath = getenv("DEVPATH");
@@ -115,7 +115,7 @@ int main(int argc, char *argv[], char *envp[])
 		subsystem = argv[1];
 
 	if (action == NULL || subsystem == NULL || devpath == NULL) {
-		err("action, subsystem or devpath missing");
+		err("action, subsystem or devpath missing\n");
 		goto exit;
 	}
 
@@ -132,7 +132,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	dev = sysfs_device_get(devpath);
 	if (dev == NULL) {
-		info("unable to open '%s'", devpath);
+		info("unable to open '%s'\n", devpath);
 		goto fail;
 	}
 
@@ -154,6 +154,10 @@ int main(int argc, char *argv[], char *envp[])
 
 	retval = udev_device_event(&rules, udev);
 
+	/* rules may change/disable the timeout */
+	if (udev->event_timeout >= 0)
+		alarm(udev->event_timeout);
+
 	if (retval == 0 && !udev->ignore_device && udev_run)
 		udev_rules_run(udev);