writing udev rules: fix rule typos

[elogind.git] / udev_db.c

diff --git a/udev_db.c b/udev_db.c
index 8c9e474ad402b6e380909477aa553a4cf1587782..518ace9a5d9822c5e1f7bfb6e9bc70adcbae1f80 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -37,7 +37,7 @@ static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len
 {
        size_t start;
 
-       /* add location of db files */
+       /* translate to location of db file */
        strlcpy(filename, udev_root, len);
        start = strlcat(filename, "/"DB_DIR"/", len);
        strlcat(filename, devpath, len);
@@ -117,6 +117,16 @@ out:
        return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+       char filename[PATH_SIZE];
+       char filename_old[PATH_SIZE];
+
+       devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+       devpath_to_db_path(devpath, filename, sizeof(filename));
+       return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
        char filename[PATH_SIZE];
@@ -157,9 +167,9 @@ int udev_db_add_device(struct udevice *udev)
                        name_index(udev->dev->devpath, name_loop->name, 1);
                }
                fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-               if (udev->link_priority)
+               if (udev->link_priority != 0)
                        fprintf(f, "L:%u\n", udev->link_priority);
-               if (udev->partitions)
+               if (udev->partitions != 0)
                        fprintf(f, "A:%u\n", udev->partitions);
                if (udev->ignore_remove)
                        fprintf(f, "R:%u\n", udev->ignore_remove);
@@ -186,7 +196,7 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
        size_t cur;
        size_t count;
 
-       strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath));
+       sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
        devpath_to_db_path(devpath, filename, sizeof(filename));
 
        if (lstat(filename, &stats) != 0) {
@@ -286,6 +296,9 @@ int udev_db_delete_device(struct udevice *udev)
        char filename[PATH_SIZE];
        struct name_entry *name_loop;
 
+       if (udev->test_run)
+               return 0;
+
        devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename));
        unlink(filename);
 
@@ -296,68 +309,6 @@ int udev_db_delete_device(struct udevice *udev)
        return 0;
 }
 
-int udev_db_lookup_name(const char *name, char *devpath, size_t len)
-{
-       char dirname[PATH_MAX];
-       size_t start;
-       DIR *dir;
-       int found = 0;
-
-       strlcpy(dirname, udev_root, sizeof(dirname));
-       start = strlcat(dirname, "/"DB_NAME_INDEX_DIR"/", sizeof(dirname));
-       strlcat(dirname, name, sizeof(dirname));
-       path_encode(&dirname[start], sizeof(dirname) - start);
-
-       dir = opendir(dirname);
-       if (dir == NULL) {
-               info("no index directory '%s': %s", dirname, strerror(errno));
-               return -1;
-       }
-
-       info("found index directory '%s'", dirname);
-       while (!found) {
-               struct dirent *ent;
-               char device[PATH_SIZE];
-               struct udevice *udev;
-
-               ent = readdir(dir);
-               if (ent == NULL || ent->d_name[0] == '\0')
-                       break;
-               if (ent->d_name[0] == '.')
-                       continue;
-
-               strlcpy(device, ent->d_name, sizeof(device));
-               path_decode(device);
-               udev = udev_device_init(NULL);
-               if (udev == NULL)
-                       break;
-               if (udev_db_get_device(udev, device) == 0) {
-                       char filename[PATH_SIZE];
-                       struct stat statbuf;
-
-                       info("found db entry '%s'", device);
-                       strlcpy(filename, udev_root, sizeof(filename));
-                       strlcat(filename, "/", sizeof(filename));
-                       strlcat(filename, name, sizeof(filename));
-                       /* make sure device entry matches dev_t */
-                       if (stat(filename, &statbuf) == 0) {
-                               if (statbuf.st_rdev == udev->devt) {
-                                       info("node '%s' matches dev_t", udev->name);
-                                       strlcpy(devpath, device, len);
-                                       found = 1;
-                               }
-                       }
-               }
-               udev_device_cleanup(udev);
-       }
-
-       closedir(dir);
-       if (found)
-               return 0;
-       else
-               return -1;
-}
-
 int udev_db_get_all_entries(struct list_head *name_list)
 {
        char dbpath[PATH_MAX];