X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=6e973e31e68213e42bc58835858b9c8c96f69990;hp=5ce257005804460dbaf35cfd3bcb0a6d74cf0294;hb=129979643f5ae0363cef23978bce5d546be2f77d;hpb=63f61c5cf639953aa38e025485919b0aa1c49b59

diff --git a/udevtest.c b/udevtest.c
index 5ce257005..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
@@ -26,21 +24,25 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
 {
 	va_list args;
 
+	if (priority > udev_log_priority)
+		return;
+
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
@@ -51,6 +53,7 @@ void log_message (int level, 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];
@@ -60,13 +63,15 @@ int main(int argc, char *argv[], char *envp[])
 
 	info("version %s", UDEV_VERSION);
 
-	if (argc < 2 || 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)
@@ -80,22 +85,17 @@ int main(int argc, char *argv[], char *envp[])
 		} else
 			devpath = argv[1];
 
-	info("looking at '%s'", devpath);
+	subsystem = argv[2];
+	setenv("DEVPATH", devpath, 1);
+	setenv("SUBSYSTEM", subsystem, 1);
+	setenv("ACTION", "add", 1);
+	info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
 
 	/* initialize the naming deamon */
-	namedev_init();
-
-	if (argc == 3)
-		subsystem = argv[2];
+	udev_rules_init(&rules, 0, 0);
 
 	/* fill in values and test_run flag*/
-	udev_init_device(&udev, devpath, subsystem);
-
-	/* skip subsystems without "dev", but handle net devices */
-	if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
-		info("don't care about '%s' devices", udev.subsystem);
-		return 2;
-	}
+	udev_init_device(&udev, devpath, subsystem, "add");
 
 	/* open the device */
 	snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
@@ -105,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;