[PATCH] udev-test.pl: use more common user/group names

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 95b85dd8bed607170e690c8c8dd752e3a9aa60e0..006d55510e3aa1b84e6e189b5d0b9ec343361502 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,5 +1,5 @@
 /*
- * udev.c
+ * udevtest.c
  *
  * Userspace devfs
  *
@@ -29,17 +29,14 @@
 
 #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"
-#include "namedev.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
-
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -54,19 +51,18 @@ 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 temp[NAME_SIZE];
-       char subsystem[] = "";
-       const int fake = 1;
-
-       main_argv = argv;
-       main_envp = envp;
+       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");
-               goto exit;
+       if (argc < 2 || argc > 3) {
+               info("Usage: udevtest <devpath> [subsystem]");
+               return 1;
        }
 
        /* initialize our configuration */
@@ -74,32 +70,49 @@ int main(int argc, char *argv[], char *envp[])
 
        /* 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")) {
-               info("not a block or class device");
-               goto exit;
+       /* initialize the naming deamon */
+       udev_rules_init();
+
+       if (argc == 3)
+               subsystem = argv[2];
+
+       /* 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;
        }
 
-       /* initialize the naming deamon */
-       namedev_init();
+       /* 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;
+       }
+
+       info("opened class_dev->name='%s'", class_dev->name);
+
+       /* simulate node creation with test flag */
+       udev.test_run = 1;
+       udev_add_device(&udev, class_dev);
 
-       /* simulate node creation with fake flag */
-       udev_add_device(devpath, subsystem, fake);
+       sysfs_close_class_device(class_dev);
 
-exit:
        return 0;
 }