src/udev: bring up to date with upstream.

These commits were authored by

    Zbigniew Jędrzejewski-Szmek
    Tom Gundersen
    Kay Sievers
    Lennart Poettering
    Shawn Landden
    Daniel Buch
    Martin Pitt
    Karel Zak
    Yang Zhiyong

Note: udev_builtin_net_setup_link has *not* been imported.  Also
still missing from udev-builtin is udev_builtin_uaccess.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 65 insertions, 60 deletions

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index f472996965..087ee4bfae 100644
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -32,6 +32,8 @@
 #include <sys/un.h>
 
 #include "udev.h"
+#include "udev-util.h"
+#include "util.h"
 
 static int verbose;
 static int dry_run;
@@ -53,7 +55,7 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
                 if (fd < 0)
                         continue;
                 if (write(fd, action, strlen(action)) < 0)
-                        log_debug("error writing '%s' to '%s': %m\n", action, filename);
+                        log_debug("error writing '%s' to '%s': %m", action, filename);
                 close(fd);
         }
 }
@@ -72,22 +74,41 @@ static const char *keyval(const char *str, const char **val, char *buf, size_t s
         return buf;
 }
 
+static void help(void) {
+        printf("Usage: udevadm trigger OPTIONS\n"
+               "  -v,--verbose                       print the list of devices while running\n"
+               "  -n,--dry-run                       do not actually trigger the events\n"
+               "  -t,--type=                         type of events to trigger\n"
+               "          devices                       sys devices (default)\n"
+               "          subsystems                    sys subsystems and drivers\n"
+               "  -c,--action=<action>               event action value, default is \"change\"\n"
+               "  -s,--subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
+               "  -S,--subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
+               "  -a,--attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
+               "  -A,--attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
+               "  -p,--property-match=<key>=<value>  trigger devices with a matching property\n"
+               "  -g,--tag-match=<key>=<value>       trigger devices with a matching property\n"
+               "  -y,--sysname-match=<name>          trigger devices with a matching name\n"
+               "  -b,--parent-match=<name>           trigger devices with that parent device\n"
+               "  -h,--help\n\n");
+}
+
 static int adm_trigger(struct udev *udev, int argc, char *argv[])
 {
         static const struct option options[] = {
-                { "verbose", no_argument, NULL, 'v' },
-                { "dry-run", no_argument, NULL, 'n' },
-                { "type", required_argument, NULL, 't' },
-                { "action", required_argument, NULL, 'c' },
-                { "subsystem-match", required_argument, NULL, 's' },
+                { "verbose",           no_argument,       NULL, 'v' },
+                { "dry-run",           no_argument,       NULL, 'n' },
+                { "type",              required_argument, NULL, 't' },
+                { "action",            required_argument, NULL, 'c' },
+                { "subsystem-match",   required_argument, NULL, 's' },
                 { "subsystem-nomatch", required_argument, NULL, 'S' },
-                { "attr-match", required_argument, NULL, 'a' },
-                { "attr-nomatch", required_argument, NULL, 'A' },
-                { "property-match", required_argument, NULL, 'p' },
-                { "tag-match", required_argument, NULL, 'g' },
-                { "sysname-match", required_argument, NULL, 'y' },
-                { "parent-match", required_argument, NULL, 'b' },
-                { "help", no_argument, NULL, 'h' },
+                { "attr-match",        required_argument, NULL, 'a' },
+                { "attr-nomatch",      required_argument, NULL, 'A' },
+                { "property-match",    required_argument, NULL, 'p' },
+                { "tag-match",         required_argument, NULL, 'g' },
+                { "sysname-match",     required_argument, NULL, 'y' },
+                { "parent-match",      required_argument, NULL, 'b' },
+                { "help",              no_argument,       NULL, 'h' },
                 {}
         };
         enum {
@@ -95,26 +116,19 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
                 TYPE_SUBSYSTEMS,
         } device_type = TYPE_DEVICES;
         const char *action = "change";
-        struct udev_enumerate *udev_enumerate;
-        int rc = 0;
+        _cleanup_udev_enumerate_unref_ struct udev_enumerate *udev_enumerate = NULL;
+        int c;
 
         udev_enumerate = udev_enumerate_new(udev);
-        if (udev_enumerate == NULL) {
-                rc = 1;
-                goto exit;
-        }
+        if (udev_enumerate == NULL)
+                return 1;
 
-        for (;;) {
-                int option;
+        while ((c = getopt_long(argc, argv, "vno:t:c:s:S:a:A:p:g:y:b:h", options, NULL)) >= 0) {
                 const char *key;
                 const char *val;
                 char buf[UTIL_PATH_SIZE];
 
-                option = getopt_long(argc, argv, "vng:o:t:hc:p:s:S:a:A:y:b:", options, NULL);
-                if (option == -1)
-                        break;
-
-                switch (option) {
+                switch (c) {
                 case 'v':
                         verbose = 1;
                         break;
@@ -122,18 +136,22 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
                         dry_run = 1;
                         break;
                 case 't':
-                        if (streq(optarg, "devices")) {
+                        if (streq(optarg, "devices"))
                                 device_type = TYPE_DEVICES;
-                        } else if (streq(optarg, "subsystems")) {
+                        else if (streq(optarg, "subsystems"))
                                 device_type = TYPE_SUBSYSTEMS;
-                        } else {
-                                log_error("unknown type --type=%s\n", optarg);
-                                rc = 2;
-                                goto exit;
+                        else {
+                                log_error("unknown type --type=%s", optarg);
+                                return 2;
                         }
                         break;
                 case 'c':
-                        action = optarg;
+                        if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) {
+                                log_error("unknown action '%s'", optarg);
+                                return 2;
+                        } else
+                                action = optarg;
+
                         break;
                 case 's':
                         udev_enumerate_add_match_subsystem(udev_enumerate, optarg);
@@ -171,9 +189,8 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
                         util_remove_trailing_chars(path, '/');
                         dev = udev_device_new_from_syspath(udev, path);
                         if (dev == NULL) {
-                                log_error("unable to open the device '%s'\n", optarg);
-                                rc = 2;
-                                goto exit;
+                                log_error("unable to open the device '%s'", optarg);
+                                return 2;
                         }
                         udev_enumerate_add_match_parent(udev_enumerate, dev);
                         /* drop reference immediately, enumerate pins the device as long as needed */
@@ -181,44 +198,32 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
                         break;
                 }
                 case 'h':
-                        printf("Usage: udevadm trigger OPTIONS\n"
-                               "  --verbose                       print the list of devices while running\n"
-                               "  --dry-run                       do not actually trigger the events\n"
-                               "  --type=                         type of events to trigger\n"
-                               "      devices                       sys devices (default)\n"
-                               "      subsystems                    sys subsystems and drivers\n"
-                               "  --action=<action>               event action value, default is \"change\"\n"
-                               "  --subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
-                               "  --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
-                               "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
-                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
-                               "  --property-match=<key>=<value>  trigger devices with a matching property\n"
-                               "  --tag-match=<key>=<value>       trigger devices with a matching property\n"
-                               "  --sysname-match=<name>          trigger devices with a matching name\n"
-                               "  --parent-match=<name>           trigger devices with that parent device\n"
-                               "  --help\n\n");
-                        goto exit;
+                        help();
+                        return 0;
+                case '?':
+                        return 1;
                 default:
-                        rc = 1;
-                        goto exit;
+                        assert_not_reached("Unknown option");
                 }
         }
 
+        if (optind < argc) {
+                fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
+                return 1;
+        }
+
         switch (device_type) {
         case TYPE_SUBSYSTEMS:
                 udev_enumerate_scan_subsystems(udev_enumerate);
                 exec_list(udev_enumerate, action);
-                goto exit;
+                return 0;
         case TYPE_DEVICES:
                 udev_enumerate_scan_devices(udev_enumerate);
                 exec_list(udev_enumerate, action);
-                goto exit;
+                return 0;
         default:
                 assert_not_reached("device_type");
         }
-exit:
-        udev_enumerate_unref(udev_enumerate);
-        return rc;
 }
 
 const struct udevadm_cmd udevadm_trigger = {