X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Ftest-udev.c;h=07716897b446e839bf8b4acdd1335280bc10569f;hp=4aa7999fc0e57ce1194c993a8a4b3b75828abd77;hb=24569e24dc94a7cffb8031eb0055e8d06cbdcb72;hpb=38f27948cdafd8a4b90a6b4f1f54b89891983506

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 4aa7999fc..07716897b 100644
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -23,116 +23,79 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
-#include <signal.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <grp.h>
+#include <sys/signalfd.h>
 
 #include "udev.h"
-#include "udev_rules.h"
-
-static void asmlinkage sig_handler(int signum)
-{
-	switch (signum) {
-		case SIGALRM:
-			exit(1);
-		case SIGINT:
-		case SIGTERM:
-			exit(20 + signum);
-	}
-}
 
 int main(int argc, char *argv[])
 {
 	struct udev *udev;
-	struct sysfs_device *dev;
-	struct udevice *udevice;
-	const char *maj, *min;
-	struct udev_rules rules;
-	const char *action;
+	struct udev_event *event = NULL;
+	struct udev_device *dev = NULL;
+	struct udev_rules *rules = NULL;
+	char syspath[UTIL_PATH_SIZE];
 	const char *devpath;
+	const char *action;
 	const char *subsystem;
-	struct sigaction act;
-	int retval = -EINVAL;
+	sigset_t mask, sigmask_orig;
+	int err = -EINVAL;
 
 	udev = udev_new();
 	if (udev == NULL)
 		exit(1);
-	dbg(udev, "version %s\n", VERSION);
-
-	/* set signal handlers */
-	memset(&act, 0x00, sizeof(act));
-	act.sa_handler = (void (*)(int)) sig_handler;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = 0;
-	sigaction(SIGALRM, &act, NULL);
-	sigaction(SIGINT, &act, NULL);
-	sigaction(SIGTERM, &act, NULL);
+	info(udev, "version %s\n", VERSION);
+	udev_selinux_init(udev);
 
-	/* trigger timeout to prevent hanging processes */
-	alarm(UDEV_EVENT_TIMEOUT);
+	sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
 
 	action = getenv("ACTION");
 	devpath = getenv("DEVPATH");
 	subsystem = getenv("SUBSYSTEM");
-	/* older kernels passed the SUBSYSTEM only as argument */
-	if (subsystem == NULL && argc == 2)
-		subsystem = argv[1];
 
 	if (action == NULL || subsystem == NULL || devpath == NULL) {
 		err(udev, "action, subsystem or devpath missing\n");
-		goto exit;
+		goto out;
 	}
 
-	/* export log_priority , as called programs may want to do the same as udev */
-	if (udev_get_log_priority(udev) > 0) {
-		char priority[32];
+	rules = udev_rules_new(udev, 1);
 
-		sprintf(priority, "%i", udev_get_log_priority(udev));
-		setenv("UDEV_LOG", priority, 1);
-	}
-
-	sysfs_init();
-	udev_rules_init(udev, &rules, 0);
-
-	dev = sysfs_device_get(udev, devpath);
+	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, "unable to open '%s'\n", devpath);
-		goto fail;
+		info(udev, "unknown device '%s'\n", devpath);
+		goto out;
 	}
 
-	udevice = udev_device_init(udev);
-	if (udevice == NULL)
-		goto fail;
-
-	/* override built-in sysfs device */
-	udevice->dev = dev;
-	util_strlcpy(udevice->action, action, sizeof(udevice->action));
+	/* skip reading of db, but read kernel parameters */
+	udev_device_set_info_loaded(dev);
+	udev_device_read_uevent_file(dev);
 
-	/* get dev_t from environment, which is needed for "remove" to work, "add" works also from sysfs */
-	maj = getenv("MAJOR");
-	min = getenv("MINOR");
-	if (maj != NULL && min != NULL)
-		udevice->devt = makedev(atoi(maj), atoi(min));
-	else
-		udevice->devt = udev_device_get_devt(udevice);
+	udev_device_set_action(dev, action);
+	event = udev_event_new(dev);
 
-	retval = udev_device_event(&rules, udevice);
-
-	/* rules may change/disable the timeout */
-	if (udevice->event_timeout >= 0)
-		alarm(udevice->event_timeout);
-
-	if (retval == 0 && !udevice->ignore_device && udev_get_run(udev))
-		udev_rules_run(udevice);
+	sigfillset(&mask);
+	sigprocmask(SIG_SETMASK, &mask, &sigmask_orig);
+	event->fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
+	if (event->fd_signal < 0) {
+		fprintf(stderr, "error creating signalfd\n");
+		goto out;
+	}
 
-	udev_device_cleanup(udevice);
-fail:
-	udev_rules_cleanup(&rules);
-	sysfs_cleanup();
-exit:
+	err = udev_event_execute_rules(event, rules, &sigmask_orig);
+	if (err == 0)
+		udev_event_execute_run(event, NULL);
+out:
+	if (event != NULL && event->fd_signal >= 0)
+		close(event->fd_signal);
+	udev_event_unref(event);
+	udev_device_unref(dev);
+	udev_rules_unref(rules);
+	udev_selinux_exit(udev);
 	udev_unref(udev);
-	if (retval != 0)
+	if (err != 0)
 		return 1;
 	return 0;
 }