int udev_db_add_device(struct udevice *udev)
{
char filename[SYSFS_PATH_MAX];
+ struct name_entry *name_loop;
FILE *f;
if (udev->test_run)
fprintf(f, "P:%s\n", udev->devpath);
fprintf(f, "N:%s\n", udev->name);
- fprintf(f, "S:%s\n", udev->symlink);
+ list_for_each_entry(name_loop, &udev->symlink_list, node)
+ fprintf(f, "S:%s\n", name_loop->name);
fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
fprintf(f, "A:%u\n", udev->partitions);
fprintf(f, "R:%u\n", udev->ignore_remove);
case 'S':
if (count > NAME_SIZE)
count = NAME_SIZE-1;
- strncpy(udev->symlink, &bufline[2], count-2);
- udev->symlink[count-2] = '\0';
+ strncpy(temp, &bufline[2], count-2);
+ temp[count-2] = '\0';
+ name_list_add(&udev->symlink_list, temp, 0);
break;
case 'A':
if (count > NAME_SIZE)
break;
}
}
+ file_unmap(buf, bufsize);
if (udev->name[0] == '\0')
return -1;
return 0;
}
-int udev_db_get_device_by_devpath(struct udevice *udev, const char *devpath)
+int udev_db_get_device(struct udevice *udev, const char *devpath)
{
char filename[SYSFS_PATH_MAX];
get_db_filename(devpath, filename, SYSFS_PATH_MAX);
- return parse_db_file(udev, filename);
+ if (parse_db_file(udev, filename) != 0)
+ return -1;
+
+ return 0;
}
-int udev_db_get_device_by_name(struct udevice *udev, const char *name)
+int udev_db_search_name(char *devpath, size_t len, const char *name)
{
- struct dirent *ent;
DIR *dir;
- char filename[NAME_SIZE];
- struct udevice db_udev;
dir = opendir(udev_db_path);
if (dir == NULL) {
}
while (1) {
+ struct dirent *ent;
+ char filename[NAME_SIZE];
+ char path[DEVPATH_SIZE];
+ char nodename[NAME_SIZE];
+ char *bufline;
+ char *buf;
+ size_t bufsize;
+ size_t cur;
+ size_t count;
+
ent = readdir(dir);
if (ent == NULL || ent->d_name[0] == '\0')
break;
snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
filename[NAME_SIZE-1] = '\0';
+ dbg("looking at '%s'", filename);
- memset(&db_udev, 0x00, sizeof(struct udevice));
- if (parse_db_file(&db_udev, filename) == 0) {
- char *pos;
- unsigned int len;
-
- if (strncmp(name, db_udev.name, NAME_SIZE) == 0) {
- goto found;
- }
-
- foreach_strpart(db_udev.symlink, " ", pos, len) {
- if (strncmp(name, pos, len) != 0)
- continue;
+ if (file_map(filename, &buf, &bufsize) != 0) {
+ dbg("unable to read db file '%s'", filename);
+ continue;
+ }
- if (len == strlen(name))
- goto found;
+ cur = 0;
+ while (cur < bufsize) {
+ count = buf_get_line(buf, bufsize, cur);
+ bufline = &buf[cur];
+ cur += count+1;
+
+ switch(bufline[0]) {
+ case 'P':
+ if (count > DEVPATH_SIZE)
+ count = DEVPATH_SIZE-1;
+ strncpy(path, &bufline[2], count-2);
+ path[count-2] = '\0';
+ break;
+ case 'N':
+ case 'S':
+ if (count > NAME_SIZE)
+ count = NAME_SIZE-1;
+ strncpy(nodename, &bufline[2], count-2);
+ nodename[count-2] = '\0';
+ dbg("compare '%s' '%s'", nodename, name);
+ if (strcmp(nodename, name) == 0) {
+ strncpy(devpath, path, len);
+ devpath[len] = '\0';
+ file_unmap(buf, bufsize);
+ closedir(dir);
+ return 0;
+ }
+ break;
+ default:
+ continue;
}
-
}
+ file_unmap(buf, bufsize);
}
closedir(dir);
-
return -1;
-
-found:
- closedir(dir);
-
- strfieldcpy(udev->devpath, db_udev.devpath);
- strfieldcpy(udev->name, db_udev.name);
- strfieldcpy(udev->symlink, db_udev.symlink);
- udev->partitions = db_udev.partitions;
- udev->ignore_remove = db_udev.ignore_remove;
- udev->devt = db_udev.devt;
-
- return 0;
}
-int udev_db_call_foreach(int (*handler_function)(struct udevice *udev))
+int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
{
- struct dirent *ent;
DIR *dir;
- char filename[NAME_SIZE];
- struct udevice db_udev;
dir = opendir(udev_db_path);
if (dir == NULL) {
}
while (1) {
+ struct dirent *ent;
+ char filename[NAME_SIZE];
+ char path[DEVPATH_SIZE];
+ char nodename[NAME_SIZE];
+ char *bufline;
+ char *buf;
+ size_t bufsize;
+ size_t cur;
+ size_t count;
+
ent = readdir(dir);
if (ent == NULL || ent->d_name[0] == '\0')
break;
snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
filename[NAME_SIZE-1] = '\0';
+ dbg("looking at '%s'", filename);
+
+ if (file_map(filename, &buf, &bufsize) != 0) {
+ dbg("unable to read db file '%s'", filename);
+ continue;
+ }
- memset(&db_udev, 0x00, sizeof(struct udevice));
- if (parse_db_file(&db_udev, filename) == 0) {
- if (handler_function(&db_udev) != 0)
+ path[0] = '\0';
+ nodename[0] = '\0';
+ cur = 0;
+ while (cur < bufsize) {
+ count = buf_get_line(buf, bufsize, cur);
+ bufline = &buf[cur];
+ cur += count+1;
+
+ switch(bufline[0]) {
+ case 'P':
+ if (count > DEVPATH_SIZE)
+ count = DEVPATH_SIZE-1;
+ strncpy(path, &bufline[2], count-2);
+ path[count-2] = '\0';
+ break;
+ case 'N':
+ if (count > NAME_SIZE)
+ count = NAME_SIZE-1;
+ strncpy(nodename, &bufline[2], count-2);
+ nodename[count-2] = '\0';
break;
+ default:
+ continue;
+ }
}
+ file_unmap(buf, bufsize);
+
+ if (path[0] == '\0' || nodename[0] == '\0')
+ continue;
+
+ if (handler_function(path, nodename) != 0)
+ break;
}
closedir(dir);
~ianmdlvl / elogind.git / blobdiff