X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=8af2120fb16856485036eb467e634b4d927ceedb;hp=df882d2d8cde6858c8f93f1c3b366bc0b7dbe636;hb=e5e2ea95a4b21ebc5297881e7e8c5ab4425bac5e;hpb=41bc97a0aded14db263b60f7902cc482c28fcfd9

diff --git a/udevtest.c b/udevtest.c
index df882d2d8..8af2120fb 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -55,9 +55,12 @@ void log_message (int level, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	struct sysfs_class_device *class_dev;
 	char *devpath;
+	char path[SYSFS_PATH_MAX];
 	char temp[NAME_SIZE];
 	char *subsystem = "";
+	struct udevice udev;
 
 	main_argv = argv;
 	main_envp = envp;
@@ -66,12 +69,9 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (argv[1] == NULL) {
 		info("udevinfo expects the DEVPATH of the sysfs device as a argument");
-		goto exit;
+		return 1;
 	}
 
-	/* initialize our configuration */
-	udev_init_config();
-
 	/* remove sysfs_path if given */
 	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
 		devpath = argv[1] + strlen(sysfs_path);
@@ -88,21 +88,38 @@ int main(int argc, char *argv[], char *envp[])
 	info("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
-	if (!strstr(devpath, "class") &&
-	    !strstr(devpath, "block")) {
-		info("not a block or class device");
-		goto exit;
+	if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
+		dbg("not a block or class device");
+		return 2;
 	}
 
+	/* initialize our configuration */
+	udev_init_config();
+
 	/* initialize the naming deamon */
 	namedev_init();
 
 	if (argv[2] != NULL)
 		subsystem = argv[2];
 
-	/* simulate node creation with fake flag */
-	udev_add_device(devpath, subsystem, FAKE);
+	/* fill in values and test_run flag*/
+	udev_set_values(&udev, devpath, subsystem);
+
+	/* open the device */
+	snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+	class_dev = sysfs_open_class_device_path(path);
+	if (class_dev == NULL) {
+		info("sysfs_open_class_device_path failed");
+		return 1;
+	}
+
+	dbg("opened class_dev->name='%s'", class_dev->name);
+
+	/* simulate node creation with test flag */
+	udev.test_run = 1;
+	udev_add_device(&udev, class_dev);
+
+	sysfs_close_class_device(class_dev);
 
-exit:
 	return 0;
 }