udev-acl: allow to skip ACL handling

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

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 27520f70614f90d25076d0452790d26a2c3777b0..90388db58e38c3113d67f4c5f0552e886a1656d6 100644 (file)
--- 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-2009 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
@@ -35,13 +35,13 @@
 
 static int udev_exit;
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
        if (signum == SIGINT || signum == SIGTERM)
                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))
@@ -68,7 +68,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 {
        struct sigaction act;
        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 +78,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 +89,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;
@@ -107,7 +109,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                                char subsys[UTIL_NAME_SIZE];
                                char *devtype;
 
-                               util_strlcpy(subsys, optarg, sizeof(subsys));
+                               util_strscpy(subsys, sizeof(subsys), optarg);
                                devtype = strchr(subsys, ':');
                                if (devtype != NULL) {
                                        devtype[0] = '\0';
@@ -117,8 +119,8 @@ 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"
+                       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> filter events\n"
@@ -135,7 +137,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(struct sigaction));
-       act.sa_handler = (void (*)(int)) sig_handler;
+       act.sa_handler = sig_handler;
        sigemptyset(&act.sa_mask);
        act.sa_flags = SA_RESTART;
        sigaction(SIGINT, &act, NULL);
@@ -202,7 +204,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 +218,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 +228,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);
                }
        }