vol_id: fix lib logging glue

[elogind.git] / udev / lib / libudev-enumerate.c

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index 72b97cebd7b5784010bbe271579625d4fab64336..458be5861a527569d12a697e042ce3baa0e7c62b 100644 (file)
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -30,36 +30,34 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 static int devices_scan_subsystem(struct udev *udev,
                                  const char *basedir, const char *subsystem, const char *subdir,
                                  struct list_head *device_list)
 {
-       char path[PATH_SIZE];
+       char path[UTIL_PATH_SIZE];
        DIR *dir;
        struct dirent *dent;
-       size_t len;
 
-       len = strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-       strlcat(path, basedir, sizeof(path));
-       strlcat(path, "/", sizeof(path));
-       strlcat(path, subsystem, sizeof(path));
+       util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+       util_strlcat(path, basedir, sizeof(path));
+       util_strlcat(path, "/", sizeof(path));
+       util_strlcat(path, subsystem, sizeof(path));
        if (subdir != NULL)
-               strlcat(path, subdir, sizeof(path));
+               util_strlcat(path, subdir, sizeof(path));
        dir = opendir(path);
        if (dir == NULL)
                return -1;
        for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-               char devpath[PATH_SIZE];
+               char syspath[UTIL_PATH_SIZE];
 
                if (dent->d_name[0] == '.')
                        continue;
-               strlcpy(devpath, &path[len], sizeof(devpath));
-               strlcat(devpath, "/", sizeof(devpath));
-               strlcat(devpath, dent->d_name, sizeof(devpath));
-               util_resolve_sys_link(udev, devpath, sizeof(devpath));
-               util_name_list_add(udev, device_list, devpath, 1);
+               util_strlcpy(syspath, path, sizeof(syspath));
+               util_strlcat(syspath, "/", sizeof(syspath));
+               util_strlcat(syspath, dent->d_name, sizeof(syspath));
+               util_resolve_sys_link(udev, syspath, sizeof(syspath));
+               util_name_list_add(udev, device_list, syspath, NULL, 1);
        }
        closedir(dir);
        return 0;
@@ -69,15 +67,15 @@ static int devices_scan_subsystems(struct udev *udev,
                                   const char *basedir, const char *subsystem, const char *subdir,
                                   struct list_head *device_list)
 {
-       char path[PATH_SIZE];
+       char path[UTIL_PATH_SIZE];
        DIR *dir;
        struct dirent *dent;
 
        if (subsystem != NULL)
                return devices_scan_subsystem(udev, basedir, subsystem, subdir, device_list);
 
-       strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-       strlcat(path, basedir, sizeof(path));
+       util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+       util_strlcat(path, basedir, sizeof(path));
        dir = opendir(path);
        if (dir == NULL)
                return -1;
@@ -90,42 +88,45 @@ static int devices_scan_subsystems(struct udev *udev,
        return 0;
 }
 
-static int devices_delay(struct udev *udev, const char *devpath)
+static int devices_delay(struct udev *udev, const char *syspath)
 {
        static const char *delay_device_list[] = {
                "/block/md",
                "/block/dm-",
                NULL
        };
+       size_t len;
        int i;
 
+       len = strlen(udev_get_sys_path(udev));
+
        for (i = 0; delay_device_list[i] != NULL; i++) {
-               if (strstr(devpath, delay_device_list[i]) != NULL) {
-                       info(udev, "delaying: %s\n", devpath);
+               if (strstr(&syspath[len], delay_device_list[i]) != NULL) {
+                       info(udev, "delaying: %s\n", syspath);
                        return 1;
                }
        }
        return 0;
 }
 
-static int devices_call(struct udev *udev, const char *devpath,
+static int devices_call(struct udev *udev, const char *syspath,
                        int (*cb)(struct udev *udev,
-                                 const char *devpath, const char *subsystem, const char *name,
+                                 const char *syspath, const char *subsystem, const char *name,
                                  void *data),
                        void *data,
                        int *cb_rc)
 {
-       char subsystem[NAME_SIZE];
+       char subsystem[UTIL_PATH_SIZE];
        const char *name;
 
-       name = strrchr(devpath, '/');
+       name = strrchr(syspath, '/');
        if (name == NULL)
                return -1;
        name++;
 
-       if (util_get_sys_subsystem(udev, devpath, subsystem, sizeof(subsystem)) < 2)
+       if (util_get_sys_subsystem(udev, syspath, subsystem, sizeof(subsystem)) < 2)
                return -1;
-       *cb_rc = cb(udev, devpath, subsystem, name, data);
+       *cb_rc = cb(udev, syspath, subsystem, name, data);
        return 0;
 }
 
@@ -144,22 +145,22 @@ static int devices_call(struct udev *udev, const char *devpath,
  **/
 int udev_enumerate_devices(struct udev *udev, const char *subsystem,
                           int (*cb)(struct udev *udev,
-                                    const char *devpath, const char *subsystem, const char *name, void *data),
+                                    const char *syspath, const char *subsystem, const char *name, void *data),
                           void *data)
 {
-       char base[PATH_SIZE];
+       char base[UTIL_PATH_SIZE];
        struct stat statbuf;
        struct list_head device_list;
-       struct name_entry *loop_device;
-       struct name_entry *tmp_device;
+       struct util_name_entry *loop_device;
+       struct util_name_entry *tmp_device;
        int cb_rc = 0;
        int count = 0;
 
        INIT_LIST_HEAD(&device_list);
 
        /* if we have /sys/subsystem/, forget all the old stuff */
-       strlcpy(base, udev_get_sys_path(udev), sizeof(base));
-       strlcat(base, "/subsystem", sizeof(base));
+       util_strlcpy(base, udev_get_sys_path(udev), sizeof(base));
+       util_strlcat(base, "/subsystem", sizeof(base));
        if (stat(base, &statbuf) == 0) {
                devices_scan_subsystems(udev, "/subsystem", subsystem, "/devices", &device_list);
        } else {
@@ -174,6 +175,7 @@ int udev_enumerate_devices(struct udev *udev, const char *subsystem,
                        if (devices_call(udev, loop_device->name, cb, data, &cb_rc) == 0)
                                count++;
                list_del(&loop_device->node);
+               free(loop_device->name);
                free(loop_device);
        }
 
@@ -183,6 +185,7 @@ int udev_enumerate_devices(struct udev *udev, const char *subsystem,
                        if (devices_call(udev, loop_device->name, cb, data, &cb_rc) == 0)
                                count++;
                list_del(&loop_device->node);
+               free(loop_device->name);
                free(loop_device);
        }