X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=e9ae799132a1be4282e1bbc016d59293091a893a;hp=d958c6173b2dacdb398c12436afa1ed0d1f2f5bd;hb=acc8322f1f8c081d36b3b1fd85903fb9ac68f0bb;hpb=db481105c2cf2092e1499736d6619bf194f91711 diff --git a/udev_db.c b/udev_db.c index d958c6173..e9ae79913 100644 --- a/udev_db.c +++ b/udev_db.c @@ -30,20 +30,16 @@ #include #include -#include "libsysfs/sysfs/libsysfs.h" -#include "udev_libc_wrapper.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, size_t len) +static int devpath_to_db_path(const char *devpath, char *filename, size_t len) { size_t start, end, i; - start = strlcpy(filename, udev_db_path, len); + /* 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; @@ -56,6 +52,21 @@ static int get_db_filename(const char *devpath, char *filename, size_t len) 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[PATH_SIZE]; @@ -68,23 +79,22 @@ int udev_db_add_device(struct udevice *udev) /* 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 && + 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; } - get_db_filename(udev->devpath, filename, sizeof(filename)); + devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); create_path(filename); f = fopen(filename, "w"); if (f == NULL) { - err("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); @@ -101,8 +111,9 @@ 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 filename[PATH_SIZE]; char line[PATH_SIZE]; unsigned int major, minor; char *bufline; @@ -111,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("no db file to read '%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); @@ -123,12 +136,6 @@ static int parse_db_file(struct udevice *udev, const char *filename) cur += count+1; switch(bufline[0]) { - case 'P': - 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 > sizeof(udev->name)) count = sizeof(udev->name); @@ -185,32 +192,23 @@ int udev_db_delete_device(struct udevice *udev) { char filename[PATH_SIZE]; - get_db_filename(udev->devpath, filename, sizeof(filename)); + 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) -{ - char filename[PATH_SIZE]; - - get_db_filename(devpath, filename, sizeof(filename)); - if (parse_db_file(udev, filename) != 0) - return -1; - - return 0; -} - -int udev_db_search_name(char *devpath, size_t len, const char *name) +int udev_db_lookup_name(const char *name, char *devpath, size_t len) { + char dbpath[PATH_MAX]; DIR *dir; - char path[PATH_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) { - err("unable to open udev_db '%s'", udev_db_path); + info("no udev_db available '%s': %s", dbpath, strerror(errno)); return -1; } @@ -227,16 +225,15 @@ 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, sizeof(filename), "%s/%s", udev_db_path, ent->d_name); + 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) { - err("unable to read db file '%s'", filename); + err("unable to read db file '%s': %s", filename, strerror(errno)); continue; } @@ -247,12 +244,6 @@ int udev_db_search_name(char *devpath, size_t len, const char *name) 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)) @@ -261,8 +252,8 @@ int udev_db_search_name(char *devpath, size_t len, const char *name) nodename[count-2] = '\0'; dbg("compare '%s' '%s'", nodename, name); if (strcmp(nodename, name) == 0) { + db_file_to_devpath(ent->d_name, devpath, len); found = 1; - break; } break; default: @@ -273,20 +264,22 @@ int udev_db_search_name(char *devpath, size_t len, const char *name) } closedir(dir); - if (found) { - strlcpy(devpath, path, len); + if (found) return 0; - } else + else return -1; } int udev_db_get_all_entries(struct list_head *name_list) { + char dbpath[PATH_MAX]; DIR *dir; - dir = opendir(udev_db_path); + strlcpy(dbpath, udev_root, sizeof(dbpath)); + strlcat(dbpath, "/"DB_DIR, sizeof(dbpath)); + dir = opendir(dbpath); if (dir == NULL) { - err("unable to open udev_db '%s'", udev_db_path); + info("no udev_db available '%s': %s", dbpath, strerror(errno)); return -1; } @@ -298,7 +291,6 @@ int udev_db_get_all_entries(struct list_head *name_list) ent = readdir(dir); if (ent == NULL || ent->d_name[0] == '\0') break; - if (ent->d_name[0] == '.') continue;