Fix libsysfs issue with relying on the detach_state file to be

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 14c511584ba8ad362861b6313f3409d4242d3ea3..93387f76d0b9d8e462a7b1b8a50c3e966353a979 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,5 +1,5 @@
 /*
- * udev.c
+ * udevtest.c
  *
  * Userspace devfs
  *
@@ -26,21 +26,25 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <syslog.h>
 
 #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 "udev_rules.h"
 #include "logging.h"
-#include "namedev.h"
 
 
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+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);
@@ -53,60 +57,63 @@ 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 = "";
+       char path[PATH_SIZE];
+       char temp[PATH_SIZE];
        struct udevice udev;
+       char *subsystem = NULL;
 
        info("version %s", UDEV_VERSION);
 
-       if (argv[1] == NULL) {
-               info("udevinfo expects the DEVPATH of the sysfs device as a argument");
+       /* 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);
+               devpath = &argv[1][strlen(sysfs_path)] ;
        else
                if (argv[1][0] != '/') {
                        /* prepend '/' if missing */
-                       strfieldcpy(temp, "/");
-                       strfieldcat(temp, argv[1]);
+                       snprintf(temp, sizeof(temp), "/%s", argv[1]);
+                       temp[sizeof(temp)-1] = '\0';
                        devpath = temp;
-               } else {
+               } else
                        devpath = argv[1];
-               }
-
-       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();
+       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 (argv[2] != NULL)
-               subsystem = argv[2];
+       udev_rules_init();
 
        /* fill in values and test_run flag*/
-       udev_set_values(&udev, devpath, subsystem, "add");
+       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;
+       }
 
        /* open the device */
-       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+       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;
        }
 
-       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;