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

diff --git a/udevtest.c b/udevtest.c
index 8af2120fb..388818d49 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,14 +29,11 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_sysfs.h"
+#include "udev_utils.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
 
 
 #ifdef LOG
@@ -59,22 +56,23 @@ int main(int argc, char *argv[], char *envp[])
 	char *devpath;
 	char path[SYSFS_PATH_MAX];
 	char temp[NAME_SIZE];
-	char *subsystem = "";
 	struct udevice udev;
-
-	main_argv = argv;
-	main_envp = envp;
+	char *subsystem = NULL;
 
 	info("version %s", UDEV_VERSION);
 
-	if (argv[1] == NULL) {
-		info("udevinfo expects the DEVPATH of the sysfs device as a argument");
+	if (argc < 2 || argc > 3) {
+		info("Usage: udevtest <devpath> [subsystem]");
 		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);
+	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+		devpath = &argv[1][strlen(sysfs_path)] ;
+	}
 	else
 		if (argv[1][0] != '/') {
 			/* prepend '/' if missing */
@@ -87,23 +85,20 @@ 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")) {
-		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)
+	if (argc == 3)
 		subsystem = argv[2];
 
 	/* fill in values and test_run flag*/
-	udev_set_values(&udev, devpath, subsystem);
+	udev_init_device(&udev, devpath, subsystem);
+
+	/* skip subsystems without "dev", but handle net devices */
+	if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+		info("don't care about '%s' devices", udev.subsystem);
+		return 2;
+	}
 
 	/* open the device */
 	snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
@@ -113,7 +108,7 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	dbg("opened class_dev->name='%s'", class_dev->name);
+	info("opened class_dev->name='%s'", class_dev->name);
 
 	/* simulate node creation with test flag */
 	udev.test_run = 1;