#include "libudev.h"
#include "libudev-private.h"
-#define ENVP_SIZE 128
-
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;
- 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 sysattr_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)
* 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
**/
* @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--;
free(udev_device->devpath_old);
free(udev_device->physdevpath);
udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
- if (udev_device->envp != NULL) {
- for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
- free(udev_device->envp[i]);
- free(udev_device->envp);
- }
+ free(udev_device->envp);
+ free(udev_device->monitor_buf);
info(udev_device->udev, "udev_device: %p released\n", udev_device);
free(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;
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;
- if (udev_device->envp) {
- for (i = 0; i < 128 && 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;
+ /* 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>@<devpath> */
+ 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;
+ info(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);