X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=e13146599cbe1354bd1b9c75e7bae90c210ae5d0;hb=e88a82b5976b8066583936a2521ba3c70dd460dd;hp=6465157fbd49ca8036eace793d423b821ca4f379;hpb=7d8787b3116f602f10a4ad158847588e044a100f;p=elogind.git diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index 6465157fb..e13146599 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -32,6 +32,122 @@ #include "libudev-private.h" #include "../udev.h" +struct udev_device { + int refcount; + struct udev *udev; + char *devpath; + char *syspath; + char *devname; + char *subsystem; + struct list_head link_list; + struct list_head env_list; + char *action; + char *driver; + char *devpath_old; + char *physdevpath; + int timeout; + dev_t devnum; + unsigned long long int seqnum; + int num_fake_partitions; + int devlink_priority; + int ignore_remove; +}; + +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); +} + +static int device_read_db(struct udev_device *udev_device) +{ + struct stat stats; + char filename[PATH_SIZE]; + char line[PATH_SIZE]; + FILE *f; + int rc = 0; + + devpath_to_db_path(udev_device->udev, udev_device->devpath, filename, sizeof(filename)); + + if (lstat(filename, &stats) != 0) { + info(udev_device->udev, "no db file to read %s: %s\n", filename, strerror(errno)); + return -1; + } + if ((stats.st_mode & S_IFMT) == S_IFLNK) { + char target[NAME_SIZE]; + int target_len; + + info(udev_device->udev, "found a symlink as db file\n"); + target_len = readlink(filename, target, sizeof(target)); + if (target_len > 0) + target[target_len] = '\0'; + else { + info(udev_device->udev, "error reading db link %s: %s\n", filename, strerror(errno)); + return -1; + } + dbg(udev_device->udev, "db link points to '%s'\n", target); + if (asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev_device->udev), target) < 0) + return -ENOMEM; + return 0; + } + + f = fopen(filename, "r"); + if (f == NULL) { + info(udev_device->udev, "error reading db file %s: %s\n", filename, strerror(errno)); + return -1; + } + while (fgets(line, sizeof(line), f)) { + ssize_t len; + const char *val; + unsigned int maj, min; + + len = strlen(line); + if (len < 4) + break; + line[len-1] = '\0'; + val = &line[2]; + + switch(line[0]) { + case 'N': + asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev_device->udev), val); + break; + case 'M': + sscanf(val, "%u:%u", &maj, &min); + device_set_devnum(udev_device, makedev(maj, min)); + break; + case 'S': + strlcpy(filename, udev_get_dev_path(udev_device->udev), sizeof(filename)); + strlcat(filename, "/", sizeof(filename)); + strlcat(filename, val, sizeof(filename)); + device_add_devlink(udev_device, filename); + break; + case 'L': + device_set_devlink_priority(udev_device, atoi(val)); + break; + case 'T': + device_set_timeout(udev_device, atoi(val)); + break; + case 'A': + device_set_num_fake_partitions(udev_device, atoi(val)); + break; + case 'R': + device_set_ignore_remove(udev_device, atoi(val)); + break; + case 'E': + device_add_property(udev_device, val); + break; + } + } + fclose(f); + + return rc; +} + struct udev_device *device_init(struct udev *udev) { struct udev_device *udev_device; @@ -47,7 +163,7 @@ struct udev_device *device_init(struct udev *udev) udev_device->udev = udev; INIT_LIST_HEAD(&udev_device->link_list); INIT_LIST_HEAD(&udev_device->env_list); - log_info(udev_device->udev, "udev_device: %p created\n", udev_device); + info(udev_device->udev, "udev_device: %p created\n", udev_device); return udev_device; } @@ -70,9 +186,6 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char * char path[PATH_SIZE]; struct stat statbuf; struct udev_device *udev_device; - struct udevice *udevice; - struct name_entry *name_loop; - int err; if (udev == NULL) return NULL; @@ -90,38 +203,15 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char * if (udev_device == NULL) return NULL; - udevice = udev_device_init(NULL); - if (udevice == NULL) { - free(udev_device); - return NULL; - } - /* resolve possible symlink to real path */ strlcpy(path, devpath, sizeof(path)); - sysfs_resolve_link(path, sizeof(path)); - udev_device->devpath = strdup(path); - log_info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device)); + sysfs_resolve_link(udev, path, sizeof(path)); + device_set_devpath(udev_device, path); + info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device)); - err = udev_db_get_device(udevice, path); - if (err >= 0) - log_info(udev, "device %p filled with udev database data\n", udev_device); + if (device_read_db(udev_device) >= 0) + info(udev, "device %p filled with udev database data\n", udev_device); - if (udevice->name[0] != '\0') - asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev), udevice->name); - - list_for_each_entry(name_loop, &udevice->symlink_list, node) { - char name[PATH_SIZE]; - - strlcpy(name, udev_get_dev_path(udev), sizeof(name)); - strlcat(name, "/", sizeof(name)); - strlcat(name, name_loop->name, sizeof(name)); - name_list_add(&udev_device->link_list, name, 0); - } - - list_for_each_entry(name_loop, &udevice->env_list, node) - name_list_add(&udev_device->env_list, name_loop->name, 0); - - udev_device_cleanup(udevice); return udev_device; } @@ -171,12 +261,16 @@ void udev_device_unref(struct udev_device *udev_device) udev_device->refcount--; if (udev_device->refcount > 0) return; - free(udev_device->devpath); + free(udev_device->syspath); free(udev_device->devname); free(udev_device->subsystem); - name_list_cleanup(&udev_device->link_list); - name_list_cleanup(&udev_device->env_list); - log_info(udev_device->udev, "udev_device: %p released\n", udev_device); + name_list_cleanup(udev_device->udev, &udev_device->link_list); + name_list_cleanup(udev_device->udev, &udev_device->env_list); + free(udev_device->action); + free(udev_device->driver); + free(udev_device->devpath_old); + free(udev_device->physdevpath); + info(udev_device->udev, "udev_device: %p released\n", udev_device); free(udev_device); } @@ -184,10 +278,10 @@ void udev_device_unref(struct udev_device *udev_device) * udev_device_get_devpath: * @udev_device: udev device * - * Retrieve the sys path of the udev device. The path does not contain - * the sys mount point. + * Retrieve the kernel devpath value of the udev device. The path + * does not contain the sys mount point, and starts with a '/'. * - * Returns: the sys path of the udev device + * Returns: the devpath of the udev device **/ const char *udev_device_get_devpath(struct udev_device *udev_device) { @@ -196,6 +290,22 @@ const char *udev_device_get_devpath(struct udev_device *udev_device) return udev_device->devpath; } +/** + * udev_device_get_syspath: + * @udev_device: udev device + * + * Retrieve the sys path of the udev device. The path is an + * absolute path and starts with the sys mount point. + * + * Returns: the sys path of the udev device + **/ +const char *udev_device_get_syspath(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return NULL; + return udev_device->syspath; +} + /** * udev_device_get_devname: * @udev_device: udev device @@ -305,3 +415,187 @@ int udev_device_get_properties(struct udev_device *udev_device, } return count; } + +const char *udev_device_get_driver(struct udev_device *udev_device) +{ + char driver[NAME_SIZE]; + + if (udev_device == NULL) + return NULL; + if (udev_device->driver != NULL) + return udev_device->driver; + if (util_get_sys_driver(udev_device->udev, udev_device->devpath, driver, sizeof(driver)) < 2) + return NULL; + udev_device->driver = strdup(driver); + return udev_device->driver; +} + +dev_t udev_device_get_devnum(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return makedev(0, 0); + return udev_device->devnum; +} + +const char *udev_device_get_action(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return NULL; + return udev_device->action; +} + +unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return 0; + return udev_device->seqnum; +} + +int device_set_devpath(struct udev_device *udev_device, const char *devpath) +{ + if (asprintf(&udev_device->syspath, "%s%s", udev_get_sys_path(udev_device->udev), devpath) < 0) + return -ENOMEM; + udev_device->devpath = &udev_device->syspath[strlen(udev_get_sys_path(udev_device->udev))]; + return 0; +} + +int device_set_subsystem(struct udev_device *udev_device, const char *subsystem) +{ + udev_device->subsystem = strdup(subsystem); + if (udev_device->subsystem == NULL) + return -1; + return 0; +} + +int device_set_devname(struct udev_device *udev_device, const char *devname) +{ + udev_device->devname = strdup(devname); + if (udev_device->devname == NULL) + return -ENOMEM; + return 0; +} + +int device_add_devlink(struct udev_device *udev_device, const char *devlink) +{ + if (name_list_add(udev_device->udev, &udev_device->link_list, devlink, 0) == NULL) + return -ENOMEM; + return 0; +} + +int device_add_property(struct udev_device *udev_device, const char *property) +{ + if (name_list_add(udev_device->udev, &udev_device->env_list, property, 0) == NULL) + return -ENOMEM; + return 0; +} + +int device_set_action(struct udev_device *udev_device, const char *action) +{ + udev_device->action = strdup(action); + if (udev_device->action == NULL) + return -ENOMEM; + return 0; +} + +int device_set_driver(struct udev_device *udev_device, const char *driver) +{ + udev_device->driver = strdup(driver); + if (udev_device->driver == NULL) + return -ENOMEM; + return 0; +} + +const char *device_get_devpath_old(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return NULL; + return udev_device->devpath_old; +} + +int device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old) +{ + udev_device->devpath_old = strdup(devpath_old); + if (udev_device->devpath_old == NULL) + return -ENOMEM; + return 0; +} + +const char *device_get_physdevpath(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return NULL; + return udev_device->physdevpath; +} + +int device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath) +{ + udev_device->physdevpath = strdup(physdevpath); + if (udev_device->physdevpath == NULL) + return -ENOMEM; + return 0; +} + +int device_get_timeout(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return -1; + return udev_device->timeout; +} + +int device_set_timeout(struct udev_device *udev_device, int timeout) +{ + udev_device->timeout = timeout; + return 0; +} + +int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum) +{ + udev_device->seqnum = seqnum; + return 0; +} + +int device_set_devnum(struct udev_device *udev_device, dev_t devnum) +{ + udev_device->devnum = devnum; + return 0; +} + +int device_get_num_fake_partitions(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return -1; + return udev_device->num_fake_partitions; +} + +int device_set_num_fake_partitions(struct udev_device *udev_device, int num) +{ + udev_device->num_fake_partitions = num; + return 0; +} + +int device_get_devlink_priority(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return -1; + return udev_device->devlink_priority; +} + +int device_set_devlink_priority(struct udev_device *udev_device, int prio) +{ + udev_device->devlink_priority = prio; + return 0; +} + +int device_get_ignore_remove(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return -1; + return udev_device->ignore_remove; +} + +int device_set_ignore_remove(struct udev_device *udev_device, int ignore) +{ + udev_device->ignore_remove = ignore; + return 0; +} +