X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev_db.c;h=34bdef375398093070cf60545224e5e5de1821da;hp=e89f2c2a15793e876ec88ca29e6b6776ffb80f54;hb=8249e04e3e9b6054768c3cd0ef72544831672b47;hpb=7d563a17f3967890331daf08d43f2f005418139b diff --git a/udev/udev_db.c b/udev/udev_db.c index e89f2c2a1..34bdef375 100644 --- a/udev/udev_db.c +++ b/udev/udev_db.c @@ -1,23 +1,21 @@ /* * Copyright (C) 2003 Greg Kroah-Hartman - * Copyright (C) 2004-2005 Kay Sievers + * Copyright (C) 2004-2008 Kay Sievers * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ - #include #include #include @@ -31,38 +29,36 @@ #include #include "udev.h" -#include "udev_selinux.h" - static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len) { size_t start; /* translate to location of db file */ - strlcpy(filename, udev_get_dev_path(udev), len); - start = strlcat(filename, "/.udev/db/", len); - strlcat(filename, devpath, len); - return path_encode(&filename[start], len - start); + util_strlcpy(filename, udev_get_dev_path(udev), len); + start = util_strlcat(filename, "/.udev/db/", len); + util_strlcat(filename, devpath, len); + return util_path_encode(&filename[start], len - start); } /* reverse mapping from the device file name to the devpath */ static int name_index(struct udev *udev, const char *devpath, const char *name, int add) { - char device[PATH_SIZE]; - char filename[PATH_SIZE * 2]; + char device[UTIL_PATH_SIZE]; + char filename[UTIL_PATH_SIZE * 2]; size_t start; int fd; /* directory with device name */ - strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - start = strlcat(filename, "/.udev/names/", sizeof(filename)); - strlcat(filename, name, sizeof(filename)); - path_encode(&filename[start], sizeof(filename) - start); + util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); + start = util_strlcat(filename, "/.udev/names/", sizeof(filename)); + util_strlcat(filename, name, sizeof(filename)); + util_path_encode(&filename[start], sizeof(filename) - start); /* entry with the devpath */ - strlcpy(device, devpath, sizeof(device)); - path_encode(device, sizeof(device)); - strlcat(filename, "/", sizeof(filename)); - strlcat(filename, device, sizeof(filename)); + util_strlcpy(device, devpath, sizeof(device)); + util_path_encode(device, sizeof(device)); + util_strlcat(filename, "/", sizeof(filename)); + util_strlcat(filename, device, sizeof(filename)); if (add) { info(udev, "creating index: '%s'\n", filename); @@ -85,14 +81,14 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list DIR *dir; int rc = 0; - strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname)); - start = strlcat(dirname, "/.udev/names/", sizeof(dirname)); - strlcat(dirname, name, sizeof(dirname)); - path_encode(&dirname[start], sizeof(dirname) - start); + util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname)); + start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname)); + util_strlcat(dirname, name, sizeof(dirname)); + util_path_encode(&dirname[start], sizeof(dirname) - start); dir = opendir(dirname); if (dir == NULL) { - info(udev, "no index directory '%s': %s\n", dirname, strerror(errno)); + info(udev, "no index directory '%s': %m\n", dirname); rc = -1; goto out; } @@ -100,7 +96,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list info(udev, "found index directory '%s'\n", dirname); while (1) { struct dirent *ent; - char device[PATH_SIZE]; + char device[UTIL_PATH_SIZE]; ent = readdir(dir); if (ent == NULL || ent->d_name[0] == '\0') @@ -108,8 +104,8 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list if (ent->d_name[0] == '.') continue; - strlcpy(device, ent->d_name, sizeof(device)); - path_decode(device); + util_strlcpy(device, ent->d_name, sizeof(device)); + util_path_decode(device); name_list_add(udev, name_list, device, 0); rc++; } @@ -120,8 +116,8 @@ out: int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpath) { - char filename[PATH_SIZE]; - char filename_old[PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; + char filename_old[UTIL_PATH_SIZE]; devpath_to_db_path(udev, devpath_old, filename_old, sizeof(filename_old)); devpath_to_db_path(udev, devpath, filename, sizeof(filename)); @@ -130,7 +126,7 @@ int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpa int udev_db_add_device(struct udevice *udevice) { - char filename[PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; if (udevice->test_run) return 0; @@ -147,11 +143,11 @@ int udev_db_add_device(struct udevice *udevice) !udevice->partitions && !udevice->ignore_remove) { int ret; dbg(udevice->udev, "nothing interesting to store, create symlink\n"); - selinux_setfscreatecon(udevice->udev, filename, NULL, S_IFLNK); + udev_selinux_setfscreatecon(udevice->udev, filename, S_IFLNK); ret = symlink(udevice->name, filename); - selinux_resetfscreatecon(udevice->udev); + udev_selinux_resetfscreatecon(udevice->udev); if (ret != 0) { - err(udevice->udev, "unable to create db link '%s': %s\n", filename, strerror(errno)); + err(udevice->udev, "unable to create db link '%s': %m\n", filename); return -1; } } else { @@ -160,7 +156,7 @@ int udev_db_add_device(struct udevice *udevice) f = fopen(filename, "w"); if (f == NULL) { - err(udevice->udev, "unable to create db file '%s': %s\n", filename, strerror(errno)); + err(udevice->udev, "unable to create db file '%s': %m\n", filename); return -1; } dbg(udevice->udev, "storing data for device '%s' in '%s'\n", udevice->dev->devpath, filename); @@ -194,8 +190,8 @@ int udev_db_add_device(struct udevice *udevice) int udev_db_get_device(struct udevice *udevice, const char *devpath) { struct stat stats; - char filename[PATH_SIZE]; - char line[PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; + char line[UTIL_PATH_SIZE]; unsigned int maj, min; char *bufline; char *buf; @@ -207,11 +203,11 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath) devpath_to_db_path(udevice->udev, devpath, filename, sizeof(filename)); if (lstat(filename, &stats) != 0) { - info(udevice->udev, "no db file to read %s: %s\n", filename, strerror(errno)); + info(udevice->udev, "no db file to read %s: %m\n", filename); return -1; } if ((stats.st_mode & S_IFMT) == S_IFLNK) { - char target[NAME_SIZE]; + char target[UTIL_NAME_SIZE]; int target_len; info(udevice->udev, "found a symlink as db file\n"); @@ -219,16 +215,16 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath) if (target_len > 0) target[target_len] = '\0'; else { - info(udevice->udev, "error reading db link %s: %s\n", filename, strerror(errno)); + info(udevice->udev, "error reading db link %s: %m\n", filename); return -1; } dbg(udevice->udev, "db link points to '%s'\n", target); - strlcpy(udevice->name, target, sizeof(udevice->name)); + util_strlcpy(udevice->name, target, sizeof(udevice->name)); return 0; } if (file_map(filename, &buf, &bufsize) != 0) { - info(udevice->udev, "error reading db file %s: %s\n", filename, strerror(errno)); + info(udevice->udev, "error reading db file %s: %m\n", filename); return -1; } @@ -245,7 +241,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath) switch(bufline[0]) { case 'N': - strlcpy(udevice->name, line, sizeof(udevice->name)); + util_strlcpy(udevice->name, line, sizeof(udevice->name)); break; case 'M': sscanf(line, "%u:%u", &maj, &min); @@ -281,7 +277,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath) int udev_db_delete_device(struct udevice *udevice) { - char filename[PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; struct name_entry *name_loop; if (udevice->test_run) @@ -296,36 +292,3 @@ int udev_db_delete_device(struct udevice *udevice) return 0; } - -int udev_db_get_all_entries(struct udev *udev, struct list_head *name_list) -{ - char dbpath[PATH_MAX]; - DIR *dir; - - strlcpy(dbpath, udev_get_dev_path(udev), sizeof(dbpath)); - strlcat(dbpath, "/.udev/db", sizeof(dbpath)); - dir = opendir(dbpath); - if (dir == NULL) { - info(udev, "no udev_db available '%s': %s\n", dbpath, strerror(errno)); - return -1; - } - - while (1) { - struct dirent *ent; - char device[PATH_SIZE]; - - ent = readdir(dir); - if (ent == NULL || ent->d_name[0] == '\0') - break; - if (ent->d_name[0] == '.') - continue; - - strlcpy(device, ent->d_name, sizeof(device)); - path_decode(device); - name_list_add(udev, name_list, device, 1); - dbg(udev, "added '%s'\n", device); - } - - closedir(dir); - return 0; -}