X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=518ace9a5d9822c5e1f7bfb6e9bc70adcbae1f80;hp=728d74a0305f9f2a916e53abe0862dbd9f4f5f15;hb=8c1711dcd03e84bfec4bb2ee767d0467fd32f6a5;hpb=2afb8cb37af32495e4f4ff9188e21cbe3a44ce6c diff --git a/udev_db.c b/udev_db.c index 728d74a03..518ace9a5 100644 --- 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); @@ -64,19 +64,69 @@ static int name_index(const char *devpath, const char *name, int add) strlcat(filename, device, sizeof(filename)); if (add) { - dbg("creating: '%s'", filename); + info("creating index: '%s'", filename); create_path(filename); fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); if (fd > 0) close(fd); } else { - dbg("removing: '%s'", filename); + info("removing index: '%s'", filename); unlink(filename); delete_path(filename); } return 0; } +int udev_db_get_devices_by_name(const char *name, struct list_head *name_list) +{ + char dirname[PATH_MAX]; + size_t start; + DIR *dir; + int rc = 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)); + rc = -1; + goto out; + } + + info("found index directory '%s'", dirname); + 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; + + strlcpy(device, ent->d_name, sizeof(device)); + path_decode(device); + name_list_add(name_list, device, 0); + rc++; + } + closedir(dir); +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]; @@ -86,25 +136,23 @@ int udev_db_add_device(struct udevice *udev) devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); create_path(filename); - name_index(udev->dev->devpath, udev->name, 1); + unlink(filename); /* - * create only a symlink with the name as the target - * if we don't have any interesting data to remember + * don't waste tmpfs memory pages, if we don't have any data to store + * create fake db-file; store the node-name in a symlink target */ if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && !udev->partitions && !udev->ignore_remove) { dbg("nothing interesting to store, create symlink"); - unlink(filename); if (symlink(udev->name, filename) != 0) { err("unable to create db link '%s': %s", filename, strerror(errno)); return -1; } } else { - struct name_entry *name_loop; FILE *f; + struct name_entry *name_loop; - unlink(filename); f = fopen(filename, "w"); if (f == NULL) { err("unable to create db file '%s': %s", filename, strerror(errno)); @@ -115,12 +163,13 @@ int udev_db_add_device(struct udevice *udev) fprintf(f, "N:%s\n", udev->name); list_for_each_entry(name_loop, &udev->symlink_list, node) { fprintf(f, "S:%s\n", name_loop->name); + /* add symlink-name to index */ 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); @@ -128,6 +177,10 @@ int udev_db_add_device(struct udevice *udev) fprintf(f, "E:%s\n", name_loop->name); fclose(f); } + + /* add name to index */ + name_index(udev->dev->devpath, udev->name, 1); + return 0; } @@ -143,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) { @@ -243,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); @@ -253,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(); - 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];