[PATCH] make the udev object available to more processing stages

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 95b85dd8bed607170e690c8c8dd752e3a9aa60e0..14c511584ba8ad362861b6313f3409d4242d3ea3 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,14 +29,11 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #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;
-
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -54,24 +51,20 @@ void log_message (int level, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+       struct sysfs_class_device *class_dev;
        char *devpath;
+       char path[SYSFS_PATH_MAX];
        char temp[NAME_SIZE];
-       char subsystem[] = "";
-       const int fake = 1;
-
-       main_argv = argv;
-       main_envp = envp;
+       char *subsystem = "";
+       struct udevice udev;
 
        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);
@@ -88,18 +81,38 @@ 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")) {
-               info("not a block or class device");
-               goto exit;
+       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();
 
-       /* simulate node creation with fake flag */
-       udev_add_device(devpath, subsystem, fake);
+       if (argv[2] != NULL)
+               subsystem = argv[2];
+
+       /* fill in values and test_run flag*/
+       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) {
+               info("sysfs_open_class_device_path failed");
+               return 1;
+       }
+
+       dbg("opened class_dev->name='%s'", class_dev->name);
+
+       /* simulate node creation with test flag */
+       udev.test_run = 1;
+       udev_add_device(&udev, class_dev);
+
+       sysfs_close_class_device(class_dev);
 
-exit:
        return 0;
 }