X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=b9a5fea489491aaf78f8c886ce28753373aa1d0c;hp=fa1629af2552197023f35b5facb51613082b4a37;hb=8474ff500fa5671185f6203f5f20162304a5c7df;hpb=7a947ce51586fd4212447643df90580542777ab9

diff --git a/udevtest.c b/udevtest.c
index fa1629af2..b9a5fea48 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -31,12 +31,8 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
 
 
 #ifdef LOG
@@ -62,19 +58,13 @@ int main(int argc, char *argv[], char *envp[])
 	char *subsystem = "";
 	struct udevice udev;
 
-	main_argv = argv;
-	main_envp = envp;
-
 	info("version %s", UDEV_VERSION);
 
 	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);
@@ -93,9 +83,12 @@ int main(int argc, char *argv[], char *envp[])
 	/* we only care about class devices and block stuff */
 	if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
 		dbg("not a block or class device");
-		goto exit;
+		return 2;
 	}
 
+	/* initialize our configuration */
+	udev_init_config();
+
 	/* initialize the naming deamon */
 	namedev_init();
 
@@ -103,20 +96,23 @@ int main(int argc, char *argv[], char *envp[])
 		subsystem = argv[2];
 
 	/* fill in values and test_run flag*/
-	udev_set_values(&udev, devpath, subsystem);
-	udev.test_run = 1;
+	udev_set_values(&udev, devpath, subsystem, "add");
 
 	/* 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)
-		dbg ("sysfs_open_class_device_path failed");
-	else
-		dbg("opened class_dev->name='%s'", class_dev->name);
+	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 fake flag */
+	/* simulate node creation with test flag */
+	udev.test_run = 1;
 	udev_add_device(&udev, class_dev);
 
-exit:
+	sysfs_close_class_device(class_dev);
+
 	return 0;
 }