X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=6e973e31e68213e42bc58835858b9c8c96f69990;hp=2caa654d4c9d5ed79fbea7743be6ff30afd7a748;hb=9bbcdb56d8221e2e839a2cf03fc071952fe7bc3c;hpb=fb39f0566e248c09772ed15a3218ef2381700b6a

diff --git a/udevtest.c b/udevtest.c
index 2caa654d4..6e973e31e 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,9 +1,7 @@
 /*
  * udevtest.c
  *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -55,6 +53,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];
@@ -64,16 +63,16 @@ int main(int argc, char *argv[], char *envp[])
 
 	info("version %s", UDEV_VERSION);
 
-	if (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)
 		devpath = &argv[1][strlen(sysfs_path)] ;
@@ -93,17 +92,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, 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 +105,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;