X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=d736711a3f7d1b62009482bd0158025ceb37822a;hp=93387f76d0b9d8e462a7b1b8a50c3e966353a979;hb=b2885eeecf517e82830f585a69ebc9c2c60cfa5e;hpb=e03a196a0d0680868ea230ab8f8d100ee90d0fa4

diff --git a/udevtest.c b/udevtest.c
index 93387f76d..d736711a3 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
@@ -23,18 +21,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
 #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 "udev_rules.h"
-#include "logging.h"
 
 
 #ifdef USE_LOG
@@ -55,28 +50,29 @@ void log_message (int priority, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
-	struct sysfs_class_device *class_dev;
+	struct udev_rules rules;
 	char *devpath;
-	char path[PATH_SIZE];
 	char temp[PATH_SIZE];
-	struct udevice udev;
-	char *subsystem = NULL;
+	struct udevice *udev;
+	struct sysfs_device *dev;
+	int retval;
+	int rc = 0;
 
 	info("version %s", UDEV_VERSION);
 
 	/* initialize our configuration */
-	udev_init_config();
+	udev_config_init();
 	if (udev_log_priority < LOG_INFO)
 		udev_log_priority = LOG_INFO;
 
-	if (argc != 3) {
-		info("Usage: udevtest <devpath> <subsystem>");
+	if (argc != 2) {
+		info("Usage: udevtest <devpath>");
 		return 1;
 	}
 
 	/* remove sysfs_path if given */
 	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
-		devpath = &argv[1][strlen(sysfs_path)] ;
+		devpath = &argv[1][strlen(sysfs_path)];
 	else
 		if (argv[1][0] != '/') {
 			/* prepend '/' if missing */
@@ -86,40 +82,51 @@ int main(int argc, char *argv[], char *envp[])
 		} else
 			devpath = argv[1];
 
-	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 */
-	udev_rules_init();
+	sysfs_init();
+	udev_rules_init(&rules, 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;
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL) {
+		info("unable to open '%s'", devpath);
+		rc = 2;
+		goto exit;
 	}
 
-	/* open the device */
-	snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
-	path[sizeof(path)-1] = '\0';
-	class_dev = sysfs_open_class_device_path(path);
-	if (class_dev == NULL) {
-		info("sysfs_open_class_device_path failed");
-		return 1;
+	udev = udev_device_init();
+	if (udev == NULL) {
+		info("can't open device");
+		rc = 3;
+		goto exit;
 	}
 
-	info("opened class_dev->name='%s'", class_dev->name);
+	/* override built-in sysfs device */
+	udev->dev = dev;
+	strcpy(udev->action, "add");
+	udev->devt = udev_device_get_devt(udev);
 
 	/* simulate node creation with test flag */
-	udev.test_run = 1;
-	udev_add_device(&udev, class_dev);
+	udev->test_run = 1;
 
-	sysfs_close_class_device(class_dev);
+	setenv("DEVPATH", udev->dev->devpath, 1);
+	setenv("SUBSYSTEM", udev->dev->subsystem, 1);
+	setenv("ACTION", "add", 1);
+
+	info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
+	retval = udev_device_event(&rules, udev);
+	if (retval == 0 && !udev->ignore_device && udev_run) {
+		struct name_entry *name_loop;
+
+		list_for_each_entry(name_loop, &udev->run_list, node) {
+			char program[PATH_SIZE];
+
+			strlcpy(program, name_loop->name, sizeof(program));
+			udev_rules_apply_format(udev, program, sizeof(program));
+			info("run: '%s'", program);
+		}
+	}
 
-	return 0;
+exit:
+	udev_rules_cleanup(&rules);
+	sysfs_cleanup();
+	return rc;
 }