{
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);
+ 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) {
- 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];
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) {
+ int ret;
dbg("nothing interesting to store, create symlink");
- unlink(filename);
- if (symlink(udev->name, filename) != 0) {
+ selinux_setfscreatecon(filename, NULL, S_IFLNK);
+ ret = symlink(udev->name, filename);
+ selinux_resetfscreatecon();
+ if (ret != 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));
- if (udev->partitions)
+ if (udev->link_priority != 0)
+ fprintf(f, "L:%u\n", udev->link_priority);
+ if (udev->partitions != 0)
fprintf(f, "A:%u\n", udev->partitions);
if (udev->ignore_remove)
fprintf(f, "R:%u\n", udev->ignore_remove);
fprintf(f, "E:%s\n", name_loop->name);
fclose(f);
}
+
+ /* add name to index */
+ name_index(udev->dev->devpath, udev->name, 1);
+
return 0;
}
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) {
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);
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);
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+1], sizeof(dirname) - (start+1));
-
- 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];
- char filename[PATH_SIZE];
- struct stat statbuf;
-
- ent = readdir(dir);
- if (ent == NULL || ent->d_name[0] == '\0')
- break;
- if (ent->d_name[0] == '.')
- continue;
-
- strlcpy(device, "/", len);
- strlcat(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;
- break;
- }
- }
-
- closedir(dir);
- if (found)
- return 0;
- else
- return -1;
-}
-
int udev_db_get_all_entries(struct list_head *name_list)
{
char dbpath[PATH_MAX];
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);
}
~ianmdlvl / elogind.git / blobdiff