- if (udev_device->envp) {
- for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
- free(udev_device->envp[i]);
- } else
- udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
-
- 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 >= ENVP_SIZE)
- break;
- }
- udev_device->envp[i] = NULL;
- info(udev_device->udev, "constructed envp from %u properties\n", i);
- udev_device->envp_uptodate = 1;
+ if (udev_device == NULL)
+ return NULL;
+ if (key == NULL)
+ return NULL;
+
+ list_entry = udev_device_get_properties_list_entry(udev_device);
+ list_entry = udev_list_entry_get_by_name(list_entry, key);
+ return udev_list_entry_get_value(list_entry);
+}
+
+#define ENVP_SIZE 128
+#define MONITOR_BUF_SIZE 4096
+static int update_envp_monitor_buf(struct udev_device *udev_device)
+{
+ struct udev_list_entry *list_entry;
+ size_t bufpos;
+ size_t len;
+ unsigned int i;
+
+ /* 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;
+
+ i = 0;
+ bufpos = 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;