X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_db.c;h=c12e88c3c413f39bda9016004c77fe14be62791d;hb=9bad6028f738e78b69d18947d586dce7b9267785;hp=df63bbe2ce147690a16d585382a16c9b2f308b85;hpb=8f2f6e426fc4cc1fa39b864a1792428a4269b751;p=elogind.git diff --git a/udev_db.c b/udev_db.c index df63bbe2c..c12e88c3c 100644 --- a/udev_db.c +++ b/udev_db.c @@ -60,6 +60,7 @@ static int get_db_filename(const char *devpath, char *filename, int len) int udev_db_add_device(struct udevice *udev) { char filename[SYSFS_PATH_MAX]; + struct name_entry *name_loop; FILE *f; if (udev->test_run) @@ -78,7 +79,8 @@ int udev_db_add_device(struct udevice *udev) 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); @@ -134,8 +136,9 @@ static int parse_db_file(struct udevice *udev, const char *filename) 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) @@ -153,6 +156,7 @@ static int parse_db_file(struct udevice *udev, const char *filename) break; } } + file_unmap(buf, bufsize); if (udev->name[0] == '\0') return -1; @@ -170,21 +174,21 @@ int udev_db_delete_device(struct udevice *udev) 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_byname(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) { @@ -193,6 +197,16 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name) } 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; @@ -202,40 +216,123 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name) 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 (file_map(filename, &buf, &bufsize) != 0) { + dbg("unable to read db file '%s'", filename); + continue; + } - if (strncmp(name, db_udev.name, NAME_SIZE) == 0) { - 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); + } - foreach_strpart(db_udev.symlink, " ", pos, len) { - if (strncmp(name, pos, len) != 0) - continue; + closedir(dir); + return -1; +} - if (len == strlen(name)) - goto found; - } +int udev_db_dump_names(int (*handler_function)(const char *path, const char *name)) +{ + DIR *dir; - } + dir = opendir(udev_db_path); + if (dir == NULL) { + dbg("unable to udev db '%s'", udev_db_path); + return -1; } - closedir(dir); + 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; - return -1; + ent = readdir(dir); + if (ent == NULL || ent->d_name[0] == '\0') + break; -found: - closedir(dir); + if (ent->d_name[0] == '.') + continue; - 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; + 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; + } + + 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); return 0; }