udevadm: settle - use libudev queue

[elogind.git] / udev / udev_db.c

diff --git a/udev/udev_db.c b/udev/udev_db.c
index 763178d50ccb8ab2ef2d794c50e893bce5eaeb8d..34bdef375398093070cf60545224e5e5de1821da 100644 (file)
--- a/udev/udev_db.c
+++ b/udev/udev_db.c
@@ -44,8 +44,8 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
 /* reverse mapping from the device file name to the devpath */
 static int name_index(struct udev *udev, const char *devpath, const char *name, int add)
 {
-       char device[PATH_SIZE];
-       char filename[PATH_SIZE * 2];
+       char device[UTIL_PATH_SIZE];
+       char filename[UTIL_PATH_SIZE * 2];
        size_t start;
        int fd;
 
@@ -88,7 +88,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 
        dir = opendir(dirname);
        if (dir == NULL) {
-               info(udev, "no index directory '%s': %s\n", dirname, strerror(errno));
+               info(udev, "no index directory '%s': %m\n", dirname);
                rc = -1;
                goto out;
        }
@@ -96,7 +96,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
        info(udev, "found index directory '%s'\n", dirname);
        while (1) {
                struct dirent *ent;
-               char device[PATH_SIZE];
+               char device[UTIL_PATH_SIZE];
 
                ent = readdir(dir);
                if (ent == NULL || ent->d_name[0] == '\0')
@@ -116,8 +116,8 @@ out:
 
 int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpath)
 {
-       char filename[PATH_SIZE];
-       char filename_old[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
+       char filename_old[UTIL_PATH_SIZE];
 
        devpath_to_db_path(udev, devpath_old, filename_old, sizeof(filename_old));
        devpath_to_db_path(udev, devpath, filename, sizeof(filename));
@@ -126,7 +126,7 @@ int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpa
 
 int udev_db_add_device(struct udevice *udevice)
 {
-       char filename[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
 
        if (udevice->test_run)
                return 0;
@@ -147,7 +147,7 @@ int udev_db_add_device(struct udevice *udevice)
                ret = symlink(udevice->name, filename);
                udev_selinux_resetfscreatecon(udevice->udev);
                if (ret != 0) {
-                       err(udevice->udev, "unable to create db link '%s': %s\n", filename, strerror(errno));
+                       err(udevice->udev, "unable to create db link '%s': %m\n", filename);
                        return -1;
                }
        } else {
@@ -156,7 +156,7 @@ int udev_db_add_device(struct udevice *udevice)
 
                f = fopen(filename, "w");
                if (f == NULL) {
-                       err(udevice->udev, "unable to create db file '%s': %s\n", filename, strerror(errno));
+                       err(udevice->udev, "unable to create db file '%s': %m\n", filename);
                        return -1;
                }
                dbg(udevice->udev, "storing data for device '%s' in '%s'\n", udevice->dev->devpath, filename);
@@ -190,8 +190,8 @@ int udev_db_add_device(struct udevice *udevice)
 int udev_db_get_device(struct udevice *udevice, const char *devpath)
 {
        struct stat stats;
-       char filename[PATH_SIZE];
-       char line[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
+       char line[UTIL_PATH_SIZE];
        unsigned int maj, min;
        char *bufline;
        char *buf;
@@ -203,11 +203,11 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
        devpath_to_db_path(udevice->udev, devpath, filename, sizeof(filename));
 
        if (lstat(filename, &stats) != 0) {
-               info(udevice->udev, "no db file to read %s: %s\n", filename, strerror(errno));
+               info(udevice->udev, "no db file to read %s: %m\n", filename);
                return -1;
        }
        if ((stats.st_mode & S_IFMT) == S_IFLNK) {
-               char target[NAME_SIZE];
+               char target[UTIL_NAME_SIZE];
                int target_len;
 
                info(udevice->udev, "found a symlink as db file\n");
@@ -215,7 +215,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
                if (target_len > 0)
                        target[target_len] = '\0';
                else {
-                       info(udevice->udev, "error reading db link %s: %s\n", filename, strerror(errno));
+                       info(udevice->udev, "error reading db link %s: %m\n", filename);
                        return -1;
                }
                dbg(udevice->udev, "db link points to '%s'\n", target);
@@ -224,7 +224,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
        }
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               info(udevice->udev, "error reading db file %s: %s\n", filename, strerror(errno));
+               info(udevice->udev, "error reading db file %s: %m\n", filename);
                return -1;
        }
 
@@ -277,7 +277,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 
 int udev_db_delete_device(struct udevice *udevice)
 {
-       char filename[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
        struct name_entry *name_loop;
 
        if (udevice->test_run)
@@ -292,36 +292,3 @@ int udev_db_delete_device(struct udevice *udevice)
 
        return 0;
 }
-
-int udev_db_get_all_entries(struct udev *udev, struct list_head *name_list)
-{
-       char dbpath[PATH_MAX];
-       DIR *dir;
-
-       util_strlcpy(dbpath, udev_get_dev_path(udev), sizeof(dbpath));
-       util_strlcat(dbpath, "/.udev/db", sizeof(dbpath));
-       dir = opendir(dbpath);
-       if (dir == NULL) {
-               info(udev, "no udev_db available '%s': %s\n", dbpath, strerror(errno));
-               return -1;
-       }
-
-       while (1) {
-               struct dirent *ent;
-               char device[PATH_SIZE];
-
-               ent = readdir(dir);
-               if (ent == NULL || ent->d_name[0] == '\0')
-                       break;
-               if (ent->d_name[0] == '.')
-                       continue;
-
-               util_strlcpy(device, ent->d_name, sizeof(device));
-               util_path_decode(device);
-               name_list_add(udev, name_list, device, 1);
-               dbg(udev, "added '%s'\n", device);
-       }
-
-       closedir(dir);
-       return 0;
-}