X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_db.c;h=f3c9509dcc8767c592af4ce17a0a010eca94143b;hb=b4e4b5a5db32177ec422c96d4440651a85d59704;hp=bf369ac2e66c54b249afeeb35d6fa450c477de77;hpb=7104c558dad47ee85860ebb891bdc8820d95154d;p=elogind.git diff --git a/udev_db.c b/udev_db.c index bf369ac2e..f3c9509dc 100644 --- a/udev_db.c +++ b/udev_db.c @@ -1,6 +1,4 @@ /* - * udev_db.c - * * Copyright (C) 2003 Greg Kroah-Hartman * Copyright (C) 2004-2005 Kay Sievers * @@ -15,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -29,22 +27,19 @@ #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" -#include "udev_db.h" -#define PATH_TO_NAME_CHAR '@' static int devpath_to_db_path(const char *devpath, char *filename, size_t len) { size_t start, end, i; /* add location of db files */ - start = strlcpy(filename, udev_db_path, len); + strlcpy(filename, udev_root, len); + start = strlcat(filename, "/"DB_DIR, len); end = strlcat(filename, devpath, len); if (end > len) end = len; @@ -75,65 +70,92 @@ static int db_file_to_devpath(const char *filename, char *devpath, size_t len) int udev_db_add_device(struct udevice *udev) { char filename[PATH_SIZE]; - struct name_entry *name_loop; - FILE *f; if (udev->test_run) return 0; - /* don't write anything if udev created only the node with the - * kernel name without any interesting data to remember + devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); + create_path(filename); + + /* + * create only a symlink with the name as the target + * if we don't have any interesting data to remember */ - if (strcmp(udev->name, udev->kernel_name) == 0 && - list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && + if (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->devpath, filename, sizeof(filename)); - create_path(filename); - f = fopen(filename, "w"); - if (f == NULL) { - err("unable to create db file '%s'", filename); - return -1; + dbg("nothing interesting to store, create symlink"); + unlink(filename); + if (symlink(udev->name, filename) != 0) { + err("unable to create db link '%s': %s", filename, strerror(errno)); + return -1; + } + } else { + struct name_entry *name_loop; + FILE *f; + + f = fopen(filename, "w"); + if (f == NULL) { + err("unable to create db file '%s': %s", filename, strerror(errno)); + return -1; + } + dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename); + + 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)); + 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); } - dbg("storing data for device '%s' in '%s'", udev->devpath, filename); - - 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)); - 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; } int udev_db_get_device(struct udevice *udev, const char *devpath) { + struct stat stats; char filename[PATH_SIZE]; char line[PATH_SIZE]; - unsigned int major, minor; + unsigned int maj, min; char *bufline; char *buf; size_t bufsize; size_t cur; size_t count; + strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath)); devpath_to_db_path(devpath, filename, sizeof(filename)); + + if (lstat(filename, &stats) != 0) { + info("no db file to read %s: %s", filename, strerror(errno)); + return -1; + } + if ((stats.st_mode & S_IFMT) == S_IFLNK) { + char target[NAME_SIZE]; + int target_len; + + info("found a symlink as db file"); + target_len = readlink(filename, target, sizeof(target)); + if (target_len > 0) + target[target_len] = '\0'; + else { + info("error reading db link %s: %s", filename, strerror(errno)); + return -1; + } + dbg("db link points to '%s'", target); + strlcpy(udev->name, target, sizeof(udev->name)); + return 0; + } + if (file_map(filename, &buf, &bufsize) != 0) { - dbg("no db file to read '%s'", filename); + info("error reading db file %s: %s", filename, strerror(errno)); return -1; } - strlcpy(udev->devpath, devpath, sizeof(udev->devpath)); cur = 0; while (cur < bufsize) { count = buf_get_line(buf, bufsize, cur); @@ -152,8 +174,8 @@ int udev_db_get_device(struct udevice *udev, const char *devpath) count = sizeof(line); memcpy(line, &bufline[2], count-2); line[count-2] = '\0'; - sscanf(line, "%u:%u", &major, &minor); - udev->devt = makedev(major, minor); + sscanf(line, "%u:%u", &maj, &min); + udev->devt = makedev(maj, min); break; case 'S': if (count > sizeof(line)) @@ -197,7 +219,7 @@ int udev_db_delete_device(struct udevice *udev) { char filename[PATH_SIZE]; - devpath_to_db_path(udev->devpath, filename, sizeof(filename)); + devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); unlink(filename); return 0; @@ -205,12 +227,15 @@ int udev_db_delete_device(struct udevice *udev) int udev_db_lookup_name(const char *name, char *devpath, size_t len) { + char dbpath[PATH_MAX]; DIR *dir; 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; } @@ -218,6 +243,7 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len) struct dirent *ent; char filename[PATH_SIZE]; char nodename[PATH_SIZE]; + struct stat stats; char *bufline; char *buf; size_t bufsize; @@ -230,12 +256,36 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len) 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 (lstat(filename, &stats) != 0) { + info("unable to read %s: %s", filename, strerror(errno)); + continue; + } + if ((stats.st_mode & S_IFMT) == S_IFLNK) { + char target[NAME_SIZE]; + int target_len; + + info("found a symlink as db file"); + target_len = readlink(filename, target, sizeof(target)); + if (target_len > 0) + target[target_len] = '\0'; + else { + info("error reading db link %s: %s", filename, strerror(errno)); + return -1; + } + dbg("db link points to '%s'", target); + if (strcmp(name, target) == 0) { + db_file_to_devpath(ent->d_name, devpath, len); + found =1; + } + continue; + } + if (file_map(filename, &buf, &bufsize) != 0) { - err("unable to read db file '%s'", filename); + info("unable to read db file '%s': %s", filename, strerror(errno)); continue; } @@ -274,11 +324,14 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len) 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; }