X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=3e17b947153604324d67226805a993530eca5601;hp=93387f76d0b9d8e462a7b1b8a50c3e966353a979;hb=8bd41f36f793f7fc208ef6beb4b2b84e35a5e728;hpb=e03a196a0d0680868ea230ab8f8d100ee90d0fa4

diff --git a/udevtest.c b/udevtest.c
index 93387f76d..3e17b9471 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -55,6 +55,7 @@ void log_message (int priority, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	struct udev_rules rules;
 	struct sysfs_class_device *class_dev;
 	char *devpath;
 	char path[PATH_SIZE];
@@ -93,17 +94,11 @@ int main(int argc, char *argv[], char *envp[])
 	info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
 
 	/* initialize the naming deamon */
-	udev_rules_init();
+	udev_rules_init(&rules, 0);
 
 	/* fill in values and test_run flag*/
 	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)) {
-		info("don't care about '%s' devices", udev.subsystem);
-		return 2;
-	}
-
 	/* open the device */
 	snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
 	path[sizeof(path)-1] = '\0';
@@ -112,13 +107,18 @@ int main(int argc, char *argv[], char *envp[])
 		info("sysfs_open_class_device_path failed");
 		return 1;
 	}
-
 	info("opened class_dev->name='%s'", class_dev->name);
 
+	if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
+		udev.devt = get_devt(class_dev);
+
 	/* simulate node creation with test flag */
 	udev.test_run = 1;
-	udev_add_device(&udev, class_dev);
-
+	if (udev.type == DEV_NET || udev.devt) {
+		udev_rules_get_name(&rules, &udev, class_dev);
+		udev_add_device(&udev, class_dev);
+	} else
+		info("only char and block devices with a dev-file are supported by this test program");
 	sysfs_close_class_device(class_dev);
 
 	return 0;