X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=93387f76d0b9d8e462a7b1b8a50c3e966353a979;hp=1e0037978beca92797abad2a628f7cb32fb4ef7d;hb=b479b4887f5a0eb69b801645ab1b14636c4b06a2;hpb=e6764498e7592f216a1895eacc485448fa4a1660

diff --git a/udevtest.c b/udevtest.c
index 1e0037978..93387f76d 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -26,21 +26,25 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+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);
@@ -60,13 +64,15 @@ int main(int argc, char *argv[], char *envp[])
 
 	info("version %s", UDEV_VERSION);
 
-	if (argc < 2 || argc > 3) {
-		info("Usage: udevtest <devpath> [subsystem]");
-		return 1;
-	}
-
 	/* initialize our configuration */
 	udev_init_config();
+	if (udev_log_priority < LOG_INFO)
+		udev_log_priority = LOG_INFO;
+
+	if (argc != 3) {
+		info("Usage: udevtest <devpath> <subsystem>");
+		return 1;
+	}
 
 	/* remove sysfs_path if given */
 	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
@@ -80,16 +86,17 @@ int main(int argc, char *argv[], char *envp[])
 		} else
 			devpath = argv[1];
 
-	info("looking at '%s'", devpath);
+	subsystem = argv[2];
+	setenv("DEVPATH", devpath, 1);
+	setenv("SUBSYSTEM", subsystem, 1);
+	setenv("ACTION", "add", 1);
+	info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
 
 	/* initialize the naming deamon */
-	namedev_init();
-
-	if (argc == 3)
-		subsystem = argv[2];
+	udev_rules_init();
 
 	/* fill in values and test_run flag*/
-	udev_init_device(&udev, devpath, subsystem);
+	udev_init_device(&udev, devpath, subsystem, "add");
 
 	/* skip subsystems without "dev", but handle net devices */
 	if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {