"UDEV_MONITOR_KERNEL/UDEV" -> "kernel/udev"

[elogind.git] / udev / udevadm-monitor.c

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 6cfad2d3b8ab81f95bef9ca509ed03478806e6aa..d8ec066467e9fbb001d3587b7580e80bc08b1e67 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -41,6 +41,29 @@ static void asmlinkage sig_handler(int signum)
                udev_exit = 1;
 }
 
+static void print_device(struct udev_device *device, const char *source, int env)
+{
+       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[])
 {
        struct sigaction act;
@@ -54,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' },
                {}
        };
 
@@ -81,7 +104,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                               "  --env    print the whole event environment\n"
                               "  --kernel print kernel uevents\n"
                               "  --udev   print udev events\n"
-                              "  --help   print this help text\n\n");
+                              "  --help\n\n");
                default:
                        goto out;
                }
@@ -92,11 +115,6 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                print_udev =1;
        }
 
-       if (getuid() != 0 && print_kernel) {
-               fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
-               goto out;
-       }
-
        /* set signal handlers */
        memset(&act, 0x00, sizeof(struct sigaction));
        act.sa_handler = (void (*)(int)) sig_handler;
@@ -107,7 +125,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
        printf("monitor will print the received events for:\n");
        if (print_udev) {
-               udev_monitor = udev_monitor_new_from_socket(udev, "@/org/kernel/udev/monitor");
+               udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
                if (udev_monitor == NULL) {
                        rc = 1;
                        goto out;
@@ -116,11 +134,12 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        rc = 2;
                        goto out;
                }
-               printf("UDEV the event which udev sends out after rule processing\n");
+               printf("UDEV - the event which udev sends out after rule processing\n");
        }
        if (print_kernel) {
-               kernel_monitor = udev_monitor_new_from_netlink(udev);
+               kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
                if (kernel_monitor == NULL) {
+                       fprintf(stderr, "unable to subscribe to kernel events\n");
                        rc = 3;
                        goto out;
                }
@@ -128,15 +147,12 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        rc = 4;
                        goto out;
                }
-               printf("UEVENT the kernel uevent\n");
+               printf("KERNEL - the kernel uevent\n");
        }
        printf("\n");
 
        while (!udev_exit) {
                int fdcount;
-               struct timeval tv;
-               struct timezone tz;
-               char timestr[64];
 
                FD_ZERO(&readfds);
                if (kernel_monitor != NULL)
@@ -148,55 +164,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) {
-                               struct udev_list *list;
-
-                               list = udev_device_get_properties_list(device);
-                               while (list != NULL) {
-                                       printf("%s=%s\n", udev_list_entry_get_name(list), udev_list_entry_get_value(list));
-                                       list = udev_list_entry_get_next(list);
-                               }
-                               printf("\n");
-                       }
+                       print_device(device, "KERNEL", 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) {
-                               struct udev_list *list;
-
-                               list = udev_device_get_properties_list(device);
-                               while (list != NULL) {
-                                       printf("%s=%s\n", udev_list_entry_get_name(list), udev_list_entry_get_value(list));
-                                       list = udev_list_entry_get_next(list);
-                               }
-                               printf("\n");
-                       }
+                       print_device(device, "UDEV", env);
                        udev_device_unref(device);
                }
        }