X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-monitor.c;h=14a6edc84465fc7c32b295a4c33342fc0b21f76c;hp=a798a81626734c5ee4db41518c6ad018819168d6;hb=c807ad918c7c61a8af3fcc930cc2a5ad4c978ea1;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index a798a8162..14a6edc84 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -41,16 +41,27 @@ static void asmlinkage sig_handler(int signum)
 		udev_exit = 1;
 }
 
-static int print_properties_cb(struct udev_device *udev_device, const char *key, const char *value, void *data)
+static void print_device(struct udev_device *device, const char *source, int env)
 {
-	printf("%s=%s\n", key, value);
-	return 0;
-}
-
-static void print_properties(struct udev_device *device)
-{
-	udev_device_get_properties(device, print_properties_cb, NULL);
-	printf("\n");
+	struct timeval tv;
+	struct timezone tz;
+
+	gettimeofday(&tv, &tz);
+	printf("%-6s[%llu.%06u] %-8s %s (%s)\n",
+	       source,
+	       (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+	       udev_device_get_action(device),
+	       udev_device_get_devpath(device),
+	       udev_device_get_subsystem(device));
+	if (env) {
+		struct udev_list_entry *list_entry;
+
+		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
+			printf("%s=%s\n",
+			       udev_list_entry_get_name(list_entry),
+			       udev_list_entry_get_value(list_entry));
+		printf("\n");
+	}
 }
 
 int udevadm_monitor(struct udev *udev, int argc, char *argv[])
@@ -66,10 +77,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 	int rc = 0;
 
 	static const struct option options[] = {
-		{ "environment", 0, NULL, 'e' },
-		{ "kernel", 0, NULL, 'k' },
-		{ "udev", 0, NULL, 'u' },
-		{ "help", 0, NULL, 'h' },
+		{ "environment", no_argument, NULL, 'e' },
+		{ "kernel", no_argument, NULL, 'k' },
+		{ "udev", no_argument, NULL, 'u' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 
@@ -146,9 +157,6 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
 	while (!udev_exit) {
 		int fdcount;
-		struct timeval tv;
-		struct timezone tz;
-		char timestr[64];
 
 		FD_ZERO(&readfds);
 		if (kernel_monitor != NULL)
@@ -160,39 +168,27 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 				 &readfds, NULL, NULL, NULL);
 		if (fdcount < 0) {
 			if (errno != EINTR)
-				fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
+				fprintf(stderr, "error receiving uevent message: %m\n");
 			continue;
 		}
 
-		if (gettimeofday(&tv, &tz) == 0) {
-			snprintf(timestr, sizeof(timestr), "%llu.%06u",
-				 (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec);
-		} else
-			timestr[0] = '\0';
-
 		if ((kernel_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(kernel_monitor), &readfds)) {
-			struct udev_device *device = udev_monitor_receive_device(kernel_monitor);
+			struct udev_device *device;
+
+			device = udev_monitor_receive_device(kernel_monitor);
 			if (device == NULL)
 				continue;
-			printf("UEVENT[%s] %-8s %s (%s)\n", timestr,
-			       udev_device_get_action(device),
-			       udev_device_get_devpath(device),
-			       udev_device_get_subsystem(device));
-			if (env)
-				print_properties(device);
+			print_device(device, "UEVENT", env);
 			udev_device_unref(device);
 		}
 
 		if ((udev_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(udev_monitor), &readfds)) {
-			struct udev_device *device = udev_monitor_receive_device(udev_monitor);
+			struct udev_device *device;
+
+			device = udev_monitor_receive_device(udev_monitor);
 			if (device == NULL)
 				continue;
-			printf("UDEV  [%s] %-8s %s (%s)\n", timestr,
-			       udev_device_get_action(device),
-			       udev_device_get_devpath(device),
-			       udev_device_get_subsystem(device));
-			if (env)
-				print_properties(device);
+			print_device(device, "UDEV", env);
 			udev_device_unref(device);
 		}
 	}