X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-monitor.c;h=d136c6070abe5604b32333eaf6e0c5b2cfb26e9a;hb=e9906fec711192761f27468244d3012041bcb0ee;hp=1f0946114dd04e56d1f78873d2d46fd9bdc3acf5;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2;p=elogind.git

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 1f0946114..d136c6070 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2010 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ static void sig_handler(int signum)
 		udev_exit = 1;
 }
 
-static void print_device(struct udev_device *device, const char *source, int env)
+static void print_device(struct udev_device *device, const char *source, int prop)
 {
 	struct timeval tv;
 	struct timezone tz;
@@ -53,7 +53,7 @@ static void print_device(struct udev_device *device, const char *source, int env
 	       udev_device_get_action(device),
 	       udev_device_get_devpath(device),
 	       udev_device_get_subsystem(device));
-	if (env) {
+	if (prop) {
 		struct udev_list_entry *list_entry;
 
 		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
@@ -67,8 +67,9 @@ static void print_device(struct udev_device *device, const char *source, int env
 int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 {
 	struct sigaction act;
+	sigset_t mask;
 	int option;
-	int env = 0;
+	int prop = 0;
 	int print_kernel = 0;
 	int print_udev = 0;
 	struct udev_list_node subsystem_match_list;
@@ -78,6 +79,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 	int rc = 0;
 
 	static const struct option options[] = {
+		{ "property", no_argument, NULL, 'p' },
 		{ "environment", no_argument, NULL, 'e' },
 		{ "kernel", no_argument, NULL, 'k' },
 		{ "udev", no_argument, NULL, 'u' },
@@ -88,13 +90,14 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
 	udev_list_init(&subsystem_match_list);
 	while (1) {
-		option = getopt_long(argc, argv, "ekus:h", options, NULL);
+		option = getopt_long(argc, argv, "epkus:h", options, NULL);
 		if (option == -1)
 			break;
 
 		switch (option) {
+		case 'p':
 		case 'e':
-			env = 1;
+			prop = 1;
 			break;
 		case 'k':
 			print_kernel = 1;
@@ -108,7 +111,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 				char *devtype;
 
 				util_strscpy(subsys, sizeof(subsys), optarg);
-				devtype = strchr(subsys, ':');
+				devtype = strchr(subsys, '/');
 				if (devtype != NULL) {
 					devtype[0] = '\0';
 					devtype++;
@@ -117,11 +120,11 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 				break;
 			}
 		case 'h':
-			printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
-			       "  --env                         print the whole event environment\n"
-			       "  --kernel                      print kernel uevents\n"
-			       "  --udev                        print udev events\n"
-			       "  --subsystem-match=<subsystem> filter events\n"
+			printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
+			       "  --property                              print the event properties\n"
+			       "  --kernel                                print kernel uevents\n"
+			       "  --udev                                  print udev events\n"
+			       "  --subsystem-match=<subsystem[/devtype]> filter events by subsystem\n"
 			       "  --help\n\n");
 		default:
 			goto out;
@@ -140,6 +143,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 	act.sa_flags = SA_RESTART;
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGINT);
+	sigaddset(&mask, SIGTERM);
+	sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
 	printf("monitor will print the received events for:\n");
 	if (print_udev) {
@@ -151,6 +158,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			rc = 1;
 			goto out;
 		}
+		udev_monitor_set_receive_buffer_size(udev_monitor, 128*1024*1024);
 
 		udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
 			const char *subsys = udev_list_entry_get_name(entry);
@@ -176,6 +184,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			rc = 3;
 			goto out;
 		}
+		udev_monitor_set_receive_buffer_size(kernel_monitor, 128*1024*1024);
 
 		udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
 			const char *subsys = udev_list_entry_get_name(entry);
@@ -202,7 +211,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 		if (udev_monitor != NULL)
 			FD_SET(udev_monitor_get_fd(udev_monitor), &readfds);
 
-		fdcount = select(UDEV_MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
+		fdcount = select(MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
 				 &readfds, NULL, NULL, NULL);
 		if (fdcount < 0) {
 			if (errno != EINTR)
@@ -216,7 +225,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			device = udev_monitor_receive_device(kernel_monitor);
 			if (device == NULL)
 				continue;
-			print_device(device, "KERNEL", env);
+			print_device(device, "KERNEL", prop);
 			udev_device_unref(device);
 		}
 
@@ -226,7 +235,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			device = udev_monitor_receive_device(udev_monitor);
 			if (device == NULL)
 				continue;
-			print_device(device, "UDEV", env);
+			print_device(device, "UDEV", prop);
 			udev_device_unref(device);
 		}
 	}