[PATCH] rename namedev_dev to udev_rule

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 4b94442608641b677e07beebf5a878dcdbf55308..006d55510e3aa1b84e6e189b5d0b9ec343361502 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,5 +1,5 @@
 /*
- * udev.c
+ * udevtest.c
  *
  * Userspace devfs
  *
@@ -32,11 +32,11 @@
 #include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -53,8 +53,8 @@ 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 path[PATH_SIZE];
+       char temp[PATH_SIZE];
        struct udevice udev;
        char *subsystem = NULL;
 
@@ -69,23 +69,21 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_config();
 
        /* remove sysfs_path if given */
-       if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+       if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
                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);
 
        /* initialize the naming deamon */
-       namedev_init();
+       udev_rules_init();
 
        if (argc == 3)
                subsystem = argv[2];
@@ -94,13 +92,14 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_device(&udev, devpath, subsystem);
 
        /* skip subsystems without "dev", but handle net devices */
-       if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+       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");