X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=e9ae799132a1be4282e1bbc016d59293091a893a;hp=1015d21221782b3347b3e02049b743a3e3978e00;hb=c2e04d6b8b82e870c6b9ce397f5fdf9c8b4efb5a;hpb=e48fc108d9731f6f091742fe6588c495d1948fac diff --git a/udev_db.c b/udev_db.c index 1015d2122..e9ae79913 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,74 +24,97 @@ #include #include #include +#include #include #include #include #include -#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" -#include "udev_utils.h" -#include "logging.h" -#include "udev_db.h" -#define PATH_TO_NAME_CHAR '@' -static int get_db_filename(const char *devpath, char *filename, int len) +static int devpath_to_db_path(const char *devpath, char *filename, size_t len) { - char temp[SYSFS_PATH_MAX]; - char *pos; + size_t start, end, i; + + /* add location of db files */ + strlcpy(filename, udev_root, len); + start = strlcat(filename, "/"DB_DIR, len); + end = strlcat(filename, devpath, len); + if (end > len) + end = len; /* replace '/' to transform path into a filename */ - strfieldcpy(temp, devpath); - pos = strchr(&temp[1], '/'); - while (pos) { - pos[0] = PATH_TO_NAME_CHAR; - pos = strchr(&pos[1], '/'); - } - snprintf(filename, len, "%s%s", udev_db_path, temp); - filename[len-1] = '\0'; + for (i = start+1; i < end; i++) + if (filename[i] == '/') + filename[i] = PATH_TO_NAME_CHAR; + + return 0; +} + +static int db_file_to_devpath(const char *filename, char *devpath, size_t len) +{ + size_t end, i; + + strlcpy(devpath, "/", len); + end = strlcat(devpath, filename, len); + + /* replace PATH_TO_NAME_CHAR to transform name into devpath */ + for (i = 1; i < end; i++) + if (devpath[i] == PATH_TO_NAME_CHAR) + devpath[i] = '/'; return 0; } 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->dev->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; + } + devpath_to_db_path(udev->dev->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': %s", filename, strerror(errno)); return -1; } - dbg("storing data for device '%s' in '%s'", udev->devpath, filename); + dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename); - fprintf(f, "P:%s\n", udev->devpath); 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); 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) +int udev_db_get_device(struct udevice *udev, const char *devpath) { - char line[NAME_SIZE]; - char temp[NAME_SIZE]; + char filename[PATH_SIZE]; + char line[PATH_SIZE]; unsigned int major, minor; char *bufline; char *buf; @@ -101,11 +122,13 @@ static int parse_db_file(struct udevice *udev, const char *filename) size_t cur; size_t count; + devpath_to_db_path(devpath, filename, sizeof(filename)); if (file_map(filename, &buf, &bufsize) != 0) { - dbg("unable to read db file '%s'", filename); + info("no db file to read %s: %s", filename, strerror(errno)); return -1; } + strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath)); cur = 0; while (cur < bufsize) { count = buf_get_line(buf, bufsize, cur); @@ -113,47 +136,48 @@ static int parse_db_file(struct udevice *udev, const char *filename) cur += count+1; switch(bufline[0]) { - case 'P': - if (count > DEVPATH_SIZE) - count = DEVPATH_SIZE-1; - strncpy(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(temp, &bufline[2], count-2); - temp[count-2] = '\0'; - name_list_add(&udev->symlink_list, temp, 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); @@ -166,41 +190,32 @@ 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); + devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); unlink(filename); return 0; } -int udev_db_get_device(struct udevice *udev, const char *devpath) +int udev_db_lookup_name(const char *name, char *devpath, size_t len) { - char filename[SYSFS_PATH_MAX]; - - get_db_filename(devpath, filename, SYSFS_PATH_MAX); - - if (parse_db_file(udev, filename) != 0) - return -1; - - return 0; -} - -int udev_db_search_name(char *devpath, size_t len, const char *name) -{ - struct dirent *ent; + char dbpath[PATH_MAX]; DIR *dir; - char filename[NAME_SIZE]; + int found = 0; - dir = opendir(udev_db_path); + strlcpy(dbpath, udev_root, sizeof(dbpath)); + strlcat(dbpath, "/"DB_DIR, sizeof(dbpath)); + dir = opendir(dbpath); if (dir == NULL) { - dbg("unable to udev db '%s'", udev_db_path); + info("no udev_db available '%s': %s", dbpath, strerror(errno)); return -1; } - while (1) { - char path[DEVPATH_SIZE]; - char nodename[NAME_SIZE]; + while (!found) { + struct dirent *ent; + char filename[PATH_SIZE]; + char nodename[PATH_SIZE]; char *bufline; char *buf; size_t bufsize; @@ -210,45 +225,35 @@ int udev_db_search_name(char *devpath, size_t len, const char *name) ent = readdir(dir); if (ent == NULL || ent->d_name[0] == '\0') break; - 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", dbpath, ent->d_name); + filename[sizeof(filename)-1] = '\0'; dbg("looking at '%s'", filename); if (file_map(filename, &buf, &bufsize) != 0) { - dbg("unable to read db file '%s'", filename); + err("unable to read db file '%s': %s", filename, strerror(errno)); continue; } cur = 0; - while (cur < bufsize) { + while (cur < bufsize && !found) { 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); + 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) { - strncpy(devpath, path, len); - devpath[len] = '\0'; - file_unmap(buf, bufsize); - closedir(dir); - return 0; + db_file_to_devpath(ent->d_name, devpath, len); + found = 1; } break; default: @@ -259,40 +264,42 @@ int udev_db_search_name(char *devpath, size_t len, const char *name) } closedir(dir); - return -1; + if (found) + return 0; + else + return -1; } -int udev_db_call_foreach(int (*handler_function)(struct udevice *udev)) +int udev_db_get_all_entries(struct list_head *name_list) { - struct dirent *ent; + char dbpath[PATH_MAX]; DIR *dir; - char filename[NAME_SIZE]; - struct udevice db_udev; - dir = opendir(udev_db_path); + strlcpy(dbpath, udev_root, sizeof(dbpath)); + strlcat(dbpath, "/"DB_DIR, sizeof(dbpath)); + dir = opendir(dbpath); if (dir == NULL) { - dbg("unable to udev db '%s'", udev_db_path); + info("no udev_db available '%s': %s", dbpath, strerror(errno)); return -1; } while (1) { + struct dirent *ent; + char filename[PATH_SIZE] = "/"; + size_t end, i; + ent = readdir(dir); if (ent == NULL || ent->d_name[0] == '\0') break; - if (ent->d_name[0] == '.') continue; - snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name); - filename[NAME_SIZE-1] = '\0'; - - dbg("found '%s'", filename); - - udev_init_device(&db_udev, NULL, NULL); - if (parse_db_file(&db_udev, filename) == 0) { - if (handler_function(&db_udev) != 0) - break; - } + end = strlcat(filename, ent->d_name, sizeof(filename)); + for (i = 1; i < end; i++) + if (filename[i] == PATH_TO_NAME_CHAR) + filename[i] = '/'; + name_list_add(name_list, filename, 1); + dbg("added '%s'", filename); } closedir(dir);