X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Ftest-udev.c;h=28c833a9e5201856173f81a1ef115ca522393584;hp=6c327a6e080b7a98888a844cefa83851138db032;hb=f1707f125ae7768eece6633d354ab4a224a3fa52;hpb=aa8734ffcb8a895fc8d66ff383cbcf8f4b78f562

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 6c327a6e0..28c833a9e 100644
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -29,16 +29,15 @@
 #include <grp.h>
 
 #include "udev.h"
-#include "udev_rules.h"
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
-			exit(1);
+			_exit(1);
 		case SIGINT:
 		case SIGTERM:
-			exit(20 + signum);
+			_exit(20 + signum);
 	}
 }
 
@@ -47,28 +46,34 @@ int main(int argc, char *argv[])
 	struct udev *udev;
 	struct udev_event *event;
 	struct udev_device *dev;
-	struct udev_rules rules;
+	struct udev_rules *rules;
 	char syspath[UTIL_PATH_SIZE];
 	const char *devpath;
 	const char *action;
 	const char *subsystem;
 	struct sigaction act;
+	sigset_t mask;
 	int err = -EINVAL;
 
 	udev = udev_new();
 	if (udev == NULL)
 		exit(1);
 	info(udev, "version %s\n", VERSION);
-	selinux_init(udev);
+	udev_selinux_init(udev);
 
 	/* 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);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGALRM);
+	sigaddset(&mask, SIGINT);
+	sigaddset(&mask, SIGTERM);
+	sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
 	/* trigger timeout to prevent hanging processes */
 	alarm(UDEV_EVENT_TIMEOUT);
@@ -82,10 +87,9 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	udev_rules_init(udev, &rules, 0);
+	rules = udev_rules_new(udev, 1);
 
-	util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-	util_strlcat(syspath, devpath, sizeof(syspath));
+	util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
 	dev = udev_device_new_from_syspath(udev, syspath);
 	if (dev == NULL) {
 		info(udev, "unknown device '%s'\n", devpath);
@@ -98,21 +102,21 @@ int main(int argc, char *argv[])
 
 	udev_device_set_action(dev, action);
 	event = udev_event_new(dev);
-	err = udev_event_run(event, &rules);
+	err = udev_event_execute_rules(event, rules);
 
 	/* rules may change/disable the timeout */
 	if (udev_device_get_event_timeout(dev) >= 0)
 		alarm(udev_device_get_event_timeout(dev));
 
-	if (err == 0 && !event->ignore_device && udev_get_run(udev))
-		udev_rules_run(event);
+	if (err == 0)
+		udev_event_execute_run(event, NULL);
 
 	udev_event_unref(event);
 	udev_device_unref(dev);
 fail:
-	udev_rules_cleanup(&rules);
+	udev_rules_unref(rules);
 exit:
-	selinux_exit(udev);
+	udev_selinux_exit(udev);
 	udev_unref(udev);
 	if (err != 0)
 		return 1;