/* add location of db files */
strlcpy(filename, udev_root, len);
- start = strlcat(filename, "/"DB_DIR, len);
+ start = strlcat(filename, "/"DB_DIR"/", len);
strlcat(filename, devpath, len);
- return path_encode(&filename[start+1], len - (start+1));
+ return path_encode(&filename[start], len - start);
}
-static size_t db_file_to_devpath(const char *filename, char *devpath, size_t len)
-{
- strlcpy(devpath, "/", len);
- strlcat(devpath, filename, len);
- return path_decode(devpath);
-}
-
-
/* reverse mapping from the device file name to the devpath */
static int name_index(const char *devpath, const char *name, int add)
{
strlcpy(filename, udev_root, sizeof(filename));
start = strlcat(filename, "/"DB_NAME_INDEX_DIR"/", sizeof(filename));
strlcat(filename, name, sizeof(filename));
- path_encode(&filename[start+1], sizeof(filename) - (start+1));
+ path_encode(&filename[start], sizeof(filename) - start);
/* entry with the devpath */
strlcpy(device, devpath, sizeof(device));
- path_encode(&device[1], sizeof(device)-1);
+ path_encode(device, sizeof(device));
+ strlcat(filename, "/", sizeof(filename));
strlcat(filename, device, sizeof(filename));
if (add) {
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)
+ fprintf(f, "L:%u\n", udev->link_priority);
if (udev->partitions)
fprintf(f, "A:%u\n", udev->partitions);
if (udev->ignore_remove)
line[count-2] = '\0';
name_list_add(&udev->symlink_list, line, 0);
break;
+ case 'L':
+ if (count > sizeof(line))
+ count = sizeof(line);
+ memcpy(line, &bufline[2], count-2);
+ line[count-2] = '\0';
+ udev->link_priority = atoi(line);
+ break;
case 'A':
if (count > sizeof(line))
count = sizeof(line);
strlcpy(dirname, udev_root, sizeof(dirname));
start = strlcat(dirname, "/"DB_NAME_INDEX_DIR"/", sizeof(dirname));
strlcat(dirname, name, sizeof(dirname));
- path_encode(&dirname[start+1], sizeof(dirname) - (start+1));
+ path_encode(&dirname[start], sizeof(dirname) - start);
dir = opendir(dirname);
if (dir == NULL) {
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')
if (ent->d_name[0] == '.')
continue;
- strlcpy(device, "/", len);
- strlcat(device, ent->d_name, sizeof(device));
+ 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);
if (ent->d_name[0] == '.')
continue;
- db_file_to_devpath(ent->d_name, device, sizeof(device));
+ strlcpy(device, ent->d_name, sizeof(device));
+ path_decode(device);
name_list_add(name_list, device, 1);
dbg("added '%s'", device);
}