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);
}
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));
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));
fprintf(f, "E:%s\n", name_loop->name);
fclose(f);
}
+
+ /* add name to index */
+ name_index(udev->dev->devpath, udev->name, 1);
+
return 0;
}
while (!found) {
struct dirent *ent;
char device[PATH_SIZE];
- char filename[PATH_SIZE];
- struct stat statbuf;
+ struct udevice *udev;
ent = readdir(dir);
if (ent == NULL || ent->d_name[0] == '\0')
strlcpy(device, ent->d_name, sizeof(device));
path_decode(device);
-
- dbg("looking at '%s'", device);
- strlcpy(filename, sysfs_path, sizeof(filename));
- strlcat(filename, device, sizeof(filename));
- if (stat(filename, &statbuf) == 0) {
- strlcpy(devpath, device, len);
- found = 1;
+ 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);