fix a debug text typo in udev_rules.c

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index f0c38b3a51b5fd7481e0782bb42a283f304978d7..6e973e31e68213e42bc58835858b9c8c96f69990 100644 (file)
--- 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
@@ -55,6 +53,7 @@ void log_message (int priority, 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];
@@ -64,16 +63,16 @@ int main(int argc, char *argv[], char *envp[])
 
        info("version %s", UDEV_VERSION);
 
-       if (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)
                devpath = &argv[1][strlen(sysfs_path)] ;
@@ -86,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 */
-       udev_rules_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 != DEV_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);
@@ -111,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;