X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=eda3f5d97e26d8e3176849cc2432ca9f8b0cc2f0;hp=daf2217765ee373efc0b326696f77d7b27cd07f8;hb=1e78dcbe51419124846e1f35e540cb0253362231;hpb=ebacd6ecc301cb4cdacd1a18f6514c4a839f5999 diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index daf221776..eda3f5d97 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -32,36 +32,38 @@ #include "libudev-private.h" struct udev_device { - int refcount; struct udev *udev; struct udev_device *parent_device; - int parent_set; char *syspath; const char *devpath; char *sysname; const char *sysnum; char *devnode; char *subsystem; - int subsystem_set; - struct udev_list_node devlinks_list; - int devlinks_uptodate; - struct udev_list_node properties_list; - char *envp[128]; - int envp_uptodate; char *driver; - int driver_set; - dev_t devnum; char *action; - int event_timeout; char *devpath_old; char *physdevpath; - int timeout; + char **envp; + char *monitor_buf; + size_t monitor_buf_len; + struct udev_list_node devlinks_list; + struct udev_list_node properties_list; + struct udev_list_node sysattr_list; unsigned long long int seqnum; + int event_timeout; + int timeout; int num_fake_partitions; int devlink_priority; - int ignore_remove; - struct udev_list_node attr_list; - int info_loaded; + int refcount; + dev_t devnum; + unsigned int parent_set:1; + unsigned int subsystem_set:1; + unsigned int devlinks_uptodate:1; + unsigned int envp_uptodate:1; + unsigned int driver_set:1; + unsigned int info_loaded:1; + unsigned int ignore_remove:1; }; static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len) @@ -75,7 +77,7 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f return util_path_encode(&filename[start], len - start); } -static int device_read_db(struct udev_device *udev_device) +int udev_device_read_db(struct udev_device *udev_device) { struct stat stats; char filename[UTIL_PATH_SIZE]; @@ -85,7 +87,7 @@ static int device_read_db(struct udev_device *udev_device) 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: %m\n", filename); + dbg(udev_device->udev, "no db file to read %s: %m\n", filename); return -1; } if ((stats.st_mode & S_IFMT) == S_IFLNK) { @@ -98,7 +100,7 @@ static int device_read_db(struct udev_device *udev_device) if (target_len > 0) target[target_len] = '\0'; else { - info(udev_device->udev, "error reading db link %s: %m\n", filename); + dbg(udev_device->udev, "error reading db link %s: %m\n", filename); return -1; } @@ -132,7 +134,7 @@ static int device_read_db(struct udev_device *udev_device) f = fopen(filename, "r"); if (f == NULL) { - info(udev_device->udev, "error reading db file %s: %m\n", filename); + dbg(udev_device->udev, "error reading db file %s: %m\n", filename); return -1; } while (fgets(line, sizeof(line), f)) { @@ -220,7 +222,7 @@ static void device_load_info(struct udev_device *device) { device->info_loaded = 1; udev_device_read_uevent_file(device); - device_read_db(device); + udev_device_read_db(device); } void udev_device_set_info_loaded(struct udev_device *device) @@ -236,22 +238,21 @@ struct udev_device *device_new(struct udev *udev) if (udev == NULL) return NULL; - udev_device = malloc(sizeof(struct udev_device)); + udev_device = calloc(1, sizeof(struct udev_device)); if (udev_device == NULL) return NULL; - memset(udev_device, 0x00, sizeof(struct udev_device)); udev_device->refcount = 1; udev_device->udev = udev; udev_list_init(&udev_device->devlinks_list); udev_list_init(&udev_device->properties_list); - udev_list_init(&udev_device->attr_list); + udev_list_init(&udev_device->sysattr_list); udev_device->event_timeout = -1; /* copy global properties */ udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) udev_device_add_property(udev_device, udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry)); - info(udev_device->udev, "udev_device: %p created\n", udev_device); + dbg(udev_device->udev, "udev_device: %p created\n", udev_device); return udev_device; } @@ -265,7 +266,7 @@ struct udev_device *device_new(struct udev *udev) * path to the device, including the sys mount point. * * The initial refcount is 1, and needs to be decremented to - * release the ressources of the udev device. + * release the resources of the udev device. * * Returns: a new udev device, or #NULL, if it does not exist **/ @@ -294,7 +295,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char * subdir = &syspath[len+1]; pos = strrchr(subdir, '/'); if (pos == NULL || pos < &subdir[2]) { - info(udev, "not a subdir :%s\n", syspath); + dbg(udev, "not a subdir :%s\n", syspath); return NULL; } @@ -329,13 +330,13 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char * util_strlcpy(file, path, sizeof(file)); util_strlcat(file, "/uevent", sizeof(file)); if (stat(file, &statbuf) != 0) { - info(udev, "not a device: %s\n", syspath); + dbg(udev, "not a device: %s\n", syspath); return NULL; } } else { /* everything else just needs to be a directory */ if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) { - info(udev, "directory not found: %s\n", syspath); + dbg(udev, "directory not found: %s\n", syspath); return NULL; } } @@ -530,7 +531,7 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device) udev_device->parent_device = device_new_from_parent(udev_device); } if (udev_device->parent_device != NULL) - info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device); + dbg(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device); return udev_device->parent_device; } @@ -586,13 +587,11 @@ struct udev_device *udev_device_ref(struct udev_device *udev_device) * @udev_device: udev device * * Drop a reference of a udev device. If the refcount reaches zero, - * the ressources of the device will be released. + * the resources of the device will be released. * **/ void udev_device_unref(struct udev_device *udev_device) { - unsigned int i; - if (udev_device == NULL) return; udev_device->refcount--; @@ -604,16 +603,16 @@ void udev_device_unref(struct udev_device *udev_device) free(udev_device->sysname); free(udev_device->devnode); free(udev_device->subsystem); - udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list); - udev_list_cleanup(udev_device->udev, &udev_device->properties_list); + udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list); + udev_list_cleanup_entries(udev_device->udev, &udev_device->properties_list); free(udev_device->action); free(udev_device->driver); free(udev_device->devpath_old); free(udev_device->physdevpath); - udev_list_cleanup(udev_device->udev, &udev_device->attr_list); - for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++) - free(udev_device->envp[i]); - info(udev_device->udev, "udev_device: %p released\n", udev_device); + udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list); + free(udev_device->envp); + free(udev_device->monitor_buf); + dbg(udev_device->udev, "udev_device: %p released\n", udev_device); free(udev_device); } @@ -747,7 +746,7 @@ struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device * void udev_device_cleanup_devlinks_list(struct udev_device *udev_device) { udev_device->devlinks_uptodate = 0; - udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list); + udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list); } /** @@ -823,7 +822,7 @@ unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device) return udev_device->seqnum; } -const char *udev_device_get_attr_value(struct udev_device *udev_device, const char *attr) +const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr) { struct udev_list_entry *list_entry; char path[UTIL_PATH_SIZE]; @@ -835,25 +834,25 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch if (udev_device == NULL) return NULL; - if (attr == NULL) + if (sysattr == NULL) return NULL; /* look for possibly already cached result */ - udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->attr_list)) { - if (strcmp(udev_list_entry_get_name(list_entry), attr) == 0) { - info(udev_device->udev, "got '%s' (%s) from cache\n", - attr, udev_list_entry_get_value(list_entry)); + udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->sysattr_list)) { + if (strcmp(udev_list_entry_get_name(list_entry), sysattr) == 0) { + dbg(udev_device->udev, "got '%s' (%s) from cache\n", + sysattr, udev_list_entry_get_value(list_entry)); return udev_list_entry_get_value(list_entry); } } util_strlcpy(path, udev_device_get_syspath(udev_device), sizeof(path)); util_strlcat(path, "/", sizeof(path)); - util_strlcat(path, attr, sizeof(path)); + util_strlcat(path, sysattr, sizeof(path)); if (lstat(path, &statbuf) != 0) { - info(udev_device->udev, "no attribute '%s', keep negative entry\n", path); - udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, NULL, 0, 0); + dbg(udev_device->udev, "no attribute '%s', keep negative entry\n", path); + udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, NULL, 0, 0); goto out; } @@ -869,8 +868,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch pos = strrchr(target, '/'); if (pos != NULL) { pos = &pos[1]; - info(udev_device->udev, "cache '%s' with link value '%s'\n", attr, pos); - list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, pos, 0, 0); + dbg(udev_device->udev, "cache '%s' with link value '%s'\n", sysattr, pos); + list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, pos, 0, 0); val = udev_list_entry_get_value(list_entry); } } @@ -888,7 +887,7 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch /* read attribute value */ fd = open(path, O_RDONLY); if (fd < 0) { - info(udev_device->udev, "attribute '%s' can not be opened\n", path); + dbg(udev_device->udev, "attribute '%s' can not be opened\n", path); goto out; } size = read(fd, value, sizeof(value)); @@ -901,8 +900,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch /* got a valid value, store it in cache and return it */ value[size] = '\0'; util_remove_trailing_chars(value, '\n'); - info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value); - list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, value, 0, 0); + dbg(udev_device->udev, "'%s' has attribute value '%s'\n", path, value); + list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, value, 0, 0); val = udev_list_entry_get_value(list_entry); out: return val; @@ -936,8 +935,13 @@ int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath } /* trailing number */ - while (isdigit(udev_device->sysname[--len])) + while (len > 0 && isdigit(udev_device->sysname[--len])) udev_device->sysnum = &udev_device->sysname[len]; + + /* sysname is completely numeric */ + if (len == 0) + udev_device->sysnum = NULL; + return 0; } @@ -981,7 +985,7 @@ struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device list_entry = udev_device_get_properties_list_entry(udev_device); list_entry = udev_list_entry_get_by_name(list_entry, key); if (list_entry != NULL) - udev_list_entry_remove(list_entry); + udev_list_entry_delete(list_entry); return NULL; } return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0); @@ -992,7 +996,7 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device char name[UTIL_PATH_SIZE]; char *val; - strncpy(name, property, sizeof(name)); + util_strlcpy(name, property, sizeof(name)); val = strchr(name, '='); if (val == NULL) return NULL; @@ -1003,29 +1007,92 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device return udev_device_add_property(udev_device, name, val); } -char **udev_device_get_properties_envp(struct udev_device *udev_device) +#define ENVP_SIZE 128 +#define MONITOR_BUF_SIZE 4096 +static int update_envp_monitor_buf(struct udev_device *udev_device) { - if (!udev_device->envp_uptodate) { - unsigned int i; - struct udev_list_entry *list_entry; + const char *action; + struct udev_list_entry *list_entry; + size_t bufpos; + size_t len; + unsigned int i; - for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++) - free(udev_device->envp[i]); - i = 0; - udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) { - asprintf(&udev_device->envp[i++], "%s=%s", - udev_list_entry_get_name(list_entry), - udev_list_entry_get_value(list_entry)); - if (i+1 >= ARRAY_SIZE(udev_device->envp)) - break; - } - udev_device->envp[i] = NULL; - info(udev_device->udev, "constructed envp from %u properties\n", i); - udev_device->envp_uptodate = 1; + /* monitor buffer of property strings */ + free(udev_device->monitor_buf); + udev_device->monitor_buf_len = 0; + udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE); + if (udev_device->monitor_buf == NULL) + return -ENOMEM; + + /* envp array, strings will point into monitor buffer */ + if (udev_device->envp == NULL) + udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE); + if (udev_device->envp == NULL) + return -ENOMEM; + + /* header @ */ + action = udev_device_get_action(udev_device); + if (action == NULL) + return -EINVAL; + bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE); + len = util_strlcpy(&udev_device->monitor_buf[bufpos], "@", MONITOR_BUF_SIZE-bufpos); + if (len >= MONITOR_BUF_SIZE-bufpos) + return -EINVAL; + bufpos += len; + len = util_strlcpy(&udev_device->monitor_buf[bufpos], + udev_device_get_devpath(udev_device), + MONITOR_BUF_SIZE-bufpos); + if (len+1 >= MONITOR_BUF_SIZE-bufpos) + return -EINVAL; + bufpos += len+1; + + i = 0; + udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) { + /* add string to envp array */ + udev_device->envp[i++] = &udev_device->monitor_buf[bufpos]; + if (i+1 >= ENVP_SIZE) + return -EINVAL; + + /* add property string to monitor buffer */ + len = util_strlcpy(&udev_device->monitor_buf[bufpos], + udev_list_entry_get_name(list_entry), MONITOR_BUF_SIZE-bufpos); + if (len >= MONITOR_BUF_SIZE-bufpos) + return -EINVAL; + bufpos += len; + len = util_strlcpy(&udev_device->monitor_buf[bufpos], "=", MONITOR_BUF_SIZE-bufpos); + if (len >= MONITOR_BUF_SIZE-bufpos) + return -EINVAL; + bufpos += len; + len = util_strlcpy(&udev_device->monitor_buf[bufpos], udev_list_entry_get_value(list_entry), + MONITOR_BUF_SIZE-bufpos); + if (len+1 >= MONITOR_BUF_SIZE-bufpos) + return -EINVAL; + bufpos += len+1; } + udev_device->envp[i] = NULL; + udev_device->monitor_buf_len = bufpos; + udev_device->envp_uptodate = 1; + dbg(udev_device->udev, "filled envp/monitor buffer, %u properties, %zu bytes\n", i, bufpos); + return 0; +} + +char **udev_device_get_properties_envp(struct udev_device *udev_device) +{ + if (!udev_device->envp_uptodate) + if (update_envp_monitor_buf(udev_device) != 0) + return NULL; return udev_device->envp; } +ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf) +{ + if (!udev_device->envp_uptodate) + if (update_envp_monitor_buf(udev_device) != 0) + return -EINVAL; + *buf = udev_device->monitor_buf; + return udev_device->monitor_buf_len; +} + int udev_device_set_action(struct udev_device *udev_device, const char *action) { free(udev_device->action);