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=513c65653bc76c17d8e7547ec6427d14db213f16;hp=f56db7ff155bbe70fa36fd2b83217cd9f148d42c;hb=b62557daff59dbe3096dc31ac1f42a20ff6a9f92;hpb=111e4f81ff057fd5869d152a503ad982e2116f85

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index f56db7ff1..513c65653 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -34,36 +34,38 @@
 #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 *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)
@@ -617,6 +619,7 @@ void udev_device_unref(struct udev_device *udev_device)
 			free(udev_device->envp[i]);
 		free(udev_device->envp);
 	}
+	free(udev_device->monitor_buf);
 	info(udev_device->udev, "udev_device: %p released\n", udev_device);
 	free(udev_device);
 }
@@ -983,6 +986,7 @@ int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
 
 struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
 {
+	udev_device->monitor_buf_len = 0;
 	udev_device->envp_uptodate = 0;
 	if (value == NULL) {
 		struct udev_list_entry *list_entry;
@@ -1018,11 +1022,12 @@ char **udev_device_get_properties_envp(struct udev_device *udev_device)
 		unsigned int i;
 		struct udev_list_entry *list_entry;
 
-		if (udev_device->envp) {
+		if (udev_device->envp != NULL) {
 			for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
 				free(udev_device->envp[i]);
-		} else
+		} 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)) {
@@ -1039,6 +1044,59 @@ char **udev_device_get_properties_envp(struct udev_device *udev_device)
 	return udev_device->envp;
 }
 
+#define MONITOR_BUF_SIZE		4096
+ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf)
+{
+	if (udev_device->monitor_buf_len == 0) {
+		const char *action;
+		struct udev_list_entry *list_entry;
+		size_t bufpos;
+		size_t len;
+
+		free(udev_device->monitor_buf);
+		udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE);
+		if (udev_device->monitor_buf == 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;
+
+		/* property strings */
+		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
+			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->monitor_buf_len = bufpos;
+	}
+	*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);