X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=ac5a7e6d653dbf93e70a181eaf869154f7f3d06b;hp=61d4b130d35f0e64aeb82b3189deaf108a5d346a;hb=853ccc433c4d45c3e1da4336f87b458ed10311ca;hpb=f8a178a35b8dee2ee46a3de298345aa4faa8f41e diff --git a/udev_db.c b/udev_db.c index 61d4b130d..ac5a7e6d6 100644 --- a/udev_db.c +++ b/udev_db.c @@ -1,8 +1,6 @@ /* * udev_db.c * - * Userspace devfs - * * Copyright (C) 2003 Greg Kroah-Hartman * Copyright (C) 2004-2005 Kay Sievers * @@ -26,12 +24,14 @@ #include #include #include +#include #include #include #include #include #include "libsysfs/sysfs/libsysfs.h" +#include "udev_libc_wrapper.h" #include "udev.h" #include "udev_utils.h" #include "logging.h" @@ -41,11 +41,11 @@ static int get_db_filename(const char *devpath, char *filename, int len) { - char temp[SYSFS_PATH_MAX]; + char temp[PATH_SIZE]; char *pos; /* replace '/' to transform path into a filename */ - strfieldcpy(temp, devpath); + strlcpy(temp, devpath, sizeof(temp)); pos = strchr(&temp[1], '/'); while (pos) { pos[0] = PATH_TO_NAME_CHAR; @@ -59,39 +59,52 @@ 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]; + char filename[PATH_SIZE]; + struct name_entry *name_loop; FILE *f; if (udev->test_run) return 0; - get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX); + /* don't write anything if udev created only the node with the + * kernel name without any interesting data to remember + */ + if (strcmp(udev->name, udev->kernel_name) == 0 && + list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && + !udev->partitions && !udev->ignore_remove) { + dbg("nothing interesting to store in udevdb, skip"); + goto exit; + } + get_db_filename(udev->devpath, filename, sizeof(filename)); create_path(filename); - f = fopen(filename, "w"); if (f == NULL) { - dbg("unable to create db file '%s'", filename); + err("unable to create db file '%s'", filename); return -1; } dbg("storing data for device '%s' in '%s'", udev->devpath, filename); 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); - + if (udev->partitions) + fprintf(f, "A:%u\n", udev->partitions); + if (udev->ignore_remove) + fprintf(f, "R:%u\n", udev->ignore_remove); + list_for_each_entry(name_loop, &udev->env_list, node) + fprintf(f, "E:%s\n", name_loop->name); fclose(f); +exit: return 0; } static int parse_db_file(struct udevice *udev, const char *filename) { - char line[NAME_SIZE]; - char temp[NAME_SIZE]; + char line[PATH_SIZE]; unsigned int major, minor; char *bufline; char *buf; @@ -100,7 +113,7 @@ static int parse_db_file(struct udevice *udev, const char *filename) size_t count; if (file_map(filename, &buf, &bufsize) != 0) { - dbg("unable to read db file '%s'", filename); + err("unable to read db file '%s'", filename); return -1; } @@ -112,47 +125,56 @@ static int parse_db_file(struct udevice *udev, const char *filename) switch(bufline[0]) { case 'P': - if (count > DEVPATH_SIZE) - count = DEVPATH_SIZE-1; - strncpy(udev->devpath, &bufline[2], count-2); + if (count > sizeof(udev->devpath)) + count = sizeof(udev->devpath); + memcpy(udev->devpath, &bufline[2], count-2); udev->devpath[count-2] = '\0'; break; case 'N': - if (count > NAME_SIZE) - count = NAME_SIZE-1; - strncpy(udev->name, &bufline[2], count-2); + if (count > sizeof(udev->name)) + count = sizeof(udev->name); + memcpy(udev->name, &bufline[2], count-2); udev->name[count-2] = '\0'; break; case 'M': - if (count > NAME_SIZE) - count = NAME_SIZE-1; - strncpy(temp, &bufline[2], count-2); - temp[count-2] = '\0'; - sscanf(temp, "%u:%u", &major, &minor); + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); + line[count-2] = '\0'; + sscanf(line, "%u:%u", &major, &minor); udev->devt = makedev(major, minor); break; case 'S': - if (count > NAME_SIZE) - count = NAME_SIZE-1; - strncpy(udev->symlink, &bufline[2], count-2); - udev->symlink[count-2] = '\0'; + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); + line[count-2] = '\0'; + name_list_add(&udev->symlink_list, line, 0); break; case 'A': - if (count > NAME_SIZE) - count = NAME_SIZE-1; - strncpy(line, &bufline[2], count-2); + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); line[count-2] = '\0'; udev->partitions = atoi(line); break; case 'R': - if (count > NAME_SIZE) - count = NAME_SIZE-1; - strncpy(line, &bufline[2], count-2); + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); line[count-2] = '\0'; udev->ignore_remove = atoi(line); break; + case 'E': + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); + line[count-2] = '\0'; + name_list_add(&udev->env_list, line, 0); + break; } } + file_unmap(buf, bufsize); if (udev->name[0] == '\0') return -1; @@ -162,37 +184,47 @@ static int parse_db_file(struct udevice *udev, const char *filename) int udev_db_delete_device(struct udevice *udev) { - char filename[SYSFS_PATH_MAX]; + char filename[PATH_SIZE]; - get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX); + get_db_filename(udev->devpath, filename, sizeof(filename)); unlink(filename); 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]; + char filename[PATH_SIZE]; + + get_db_filename(devpath, filename, sizeof(filename)); - get_db_filename(devpath, filename, SYSFS_PATH_MAX); + if (parse_db_file(udev, filename) != 0) + return -1; - return parse_db_file(udev, filename); + 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) { - dbg("unable to udev db '%s'", udev_db_path); + err("unable to open udev_db '%s'", udev_db_path); return -1; } while (1) { + struct dirent *ent; + char filename[PATH_SIZE]; + char path[PATH_SIZE]; + char nodename[PATH_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; @@ -200,42 +232,125 @@ int udev_db_get_device_by_name(struct udevice *udev, const char *name) if (ent->d_name[0] == '.') continue; - snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name); - filename[NAME_SIZE-1] = '\0'; + snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name); + filename[sizeof(filename)-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) { + err("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 > sizeof(path)) + count = sizeof(path); + memcpy(path, &bufline[2], count-2); + path[count-2] = '\0'; + break; + case 'N': + case 'S': + if (count > sizeof(nodename)) + count = sizeof(nodename); + memcpy(nodename, &bufline[2], count-2); + nodename[count-2] = '\0'; + dbg("compare '%s' '%s'", nodename, name); + if (strcmp(nodename, name) == 0) { + strlcpy(devpath, nodename, len); + devpath[count-2] = '\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) { + err("unable to open udev_db '%s'", udev_db_path); + return -1; } - closedir(dir); + while (1) { + struct dirent *ent; + char filename[PATH_SIZE]; + char path[PATH_SIZE]; + char nodename[PATH_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, sizeof(filename), "%s/%s", udev_db_path, ent->d_name); + filename[sizeof(filename)-1] = '\0'; + dbg("looking at '%s'", filename); + if (file_map(filename, &buf, &bufsize) != 0) { + err("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 > sizeof(path)) + count = sizeof(path); + memcpy(path, &bufline[2], count-2); + path[count-2] = '\0'; + break; + case 'N': + if (count > sizeof(nodename)) + count = sizeof(nodename); + memcpy(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; }