X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-monitor.c;h=502fe24ce1586095731bad23691cf6049a293a4d;hb=1028fe14b65d861415cda99c4ff7d0bafd67bb7f;hp=6c6f4aa7e063447d3ae9bcc276775e204e4850eb;hpb=cb25a9585d87d8dd13d9eae66fd232e3dfdc8fac;p=elogind.git

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 6c6f4aa7e..502fe24ce 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -54,7 +54,7 @@ struct udev_monitor {
  * socket will be used.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev monitor.
+ * release the resources of the udev monitor.
  *
  * Returns: a new udev monitor, or #NULL, in case of an error
  **/
@@ -67,10 +67,9 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 		return NULL;
 	if (socket_path == NULL)
 		return NULL;
-	udev_monitor = malloc(sizeof(struct udev_monitor));
+	udev_monitor = calloc(1, sizeof(struct udev_monitor));
 	if (udev_monitor == NULL)
 		return NULL;
-	memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
 	udev_monitor->refcount = 1;
 	udev_monitor->udev = udev;
 
@@ -95,7 +94,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 		free(udev_monitor);
 		return NULL;
 	}
-	info(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
+	dbg(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
 	return udev_monitor;
 }
 
@@ -105,10 +104,9 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
 	if (udev == NULL)
 		return NULL;
-	udev_monitor = malloc(sizeof(struct udev_monitor));
+	udev_monitor = calloc(1, sizeof(struct udev_monitor));
 	if (udev_monitor == NULL)
 		return NULL;
-	memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
 	udev_monitor->refcount = 1;
 	udev_monitor->udev = udev;
 
@@ -123,7 +121,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 	udev_monitor->snl.nl_pid = getpid();
 	udev_monitor->snl.nl_groups = 1;
 
-	info(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor);
+	dbg(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor);
 	return udev_monitor;
 }
 
@@ -138,7 +136,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
 			err(udev_monitor->udev, "bind failed: %m\n");
 			return err;
 		}
-		info(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
+		dbg(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
 	} else if (udev_monitor->sun.sun_family != 0) {
 		err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
 		if (err < 0) {
@@ -147,7 +145,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
 		}
 		/* enable receiving of the sender credentials */
 		setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
-		info(udev_monitor->udev, "monitor %p listening on socket\n", udev_monitor);
+		dbg(udev_monitor->udev, "monitor %p listening on socket\n", udev_monitor);
 	}
 	return 0;
 }
@@ -180,7 +178,7 @@ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor)
  * @udev_monitor: udev monitor
  *
  * Drop a reference ofa udev monitor. If the refcount reaches zero,
- * the bound socket will be closed, and the ressources of the monitor
+ * the bound socket will be closed, and the resources of the monitor
  * will be released.
  *
  **/
@@ -193,7 +191,7 @@ void udev_monitor_unref(struct udev_monitor *udev_monitor)
 		return;
 	if (udev_monitor->sock >= 0)
 		close(udev_monitor->sock);
-	info(udev_monitor->udev, "monitor %p released\n", udev_monitor);
+	dbg(udev_monitor->udev, "monitor %p released\n", udev_monitor);
 	free(udev_monitor);
 }
 
@@ -235,11 +233,11 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
  * device, fill in the received data, and return the device.
  *
  * Only socket connections with uid=0 are accepted. The caller
- * needs to make sure, that there is data to read from the socket,
- * the call will block until the socket becomes readable.
+ * needs to make sure that there is data to read from the socket.
+ * The call will block until the socket becomes readable.
  *
  * 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, in case of an error
  **/
@@ -382,25 +380,15 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 
 int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
 {
-	const char *action;
-	struct udev_list_entry *list_entry;
-	char buf[4096];
-	size_t bufpos;
+	const char *buf;
+	ssize_t len;
 	ssize_t count;
 
-	action = udev_device_get_action(udev_device);
-	if (action == NULL)
-		return -EINVAL;
-	bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, udev_device_get_devpath(udev_device));
-	bufpos++;
-	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-		bufpos += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
-				   udev_list_entry_get_name(list_entry),
-				   udev_list_entry_get_value(list_entry));
-		bufpos++;
-	}
+	len = udev_device_get_properties_monitor_buf(udev_device, &buf);
+	if (len < 32)
+		return -1;
 	count = sendto(udev_monitor->sock,
-		       &buf, bufpos, 0,
+		       buf, len, 0,
 		       (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
 	info(udev_monitor->udev, "passed %zi bytes to monitor %p, \n", count, udev_monitor);
 	return count;