while (1) -> for (;;)

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

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index db7d1e05718bfc12e3cfec11e19ab1aabc360564..481e9cf163c92a8e052a7dbf127138440f6cd0ff 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Kay Sievers <kayi.sievers@vrfy.org>
+ * Copyright (C) 2008-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
@@ -95,13 +95,13 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                { "verbose", no_argument, NULL, 'v' },
                { "dry-run", no_argument, NULL, 'n' },
                { "type", required_argument, NULL, 't' },
-               { "retry-failed", no_argument, NULL, 'F' },
                { "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' },
                { "help", no_argument, NULL, 'h' },
                {}
@@ -111,7 +111,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                TYPE_SUBSYSTEMS,
                TYPE_FAILED,
        } device_type = TYPE_DEVICES;
-       const char *action = "add";
+       const char *action = "change";
        struct udev_enumerate *udev_enumerate;
        int rc = 0;
 
@@ -122,13 +122,13 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                goto exit;
        }
 
-       while (1) {
+       for (;;) {
                int option;
                const char *key;
                const char *val;
                char buf[UTIL_PATH_SIZE];
 
-               option = getopt_long(argc, argv, "vnFo:t:hcp:s:S:a:A:y:", options, NULL);
+               option = getopt_long(argc, argv, "vng:o:t:hcp:s:S:a:A:y:", options, NULL);
                if (option == -1)
                        break;
 
@@ -147,15 +147,11 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                        } else if (strcmp(optarg, "failed") == 0) {
                                device_type = TYPE_FAILED;
                        } else {
-                               fprintf(stderr, "unknown type --type=%s\n", optarg);
                                err(udev, "unknown type --type=%s\n", optarg);
                                rc = 2;
                                goto exit;
                        }
                        break;
-               case 'F':
-                       device_type = TYPE_FAILED;
-                       break;
                case 'c':
                        action = optarg;
                        break;
@@ -177,6 +173,9 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                        key = keyval(optarg, &val, buf, sizeof(buf));
                        udev_enumerate_add_match_property(udev_enumerate, key, val);
                        break;
+               case 'g':
+                       udev_enumerate_add_match_tag(udev_enumerate, optarg);
+                       break;
                case 'y':
                        udev_enumerate_add_match_sysname(udev_enumerate, optarg);
                        break;
@@ -189,12 +188,13 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                               "      subsystems                    sys subsystems and drivers\n"
                               "      failed                        trigger only the events which have been\n"
                               "                                    marked as failed during a previous run\n"
-                              "  --action=<action>               event action value, default is \"add\"\n"
-                              "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
-                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\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"
                               "  --help\n\n");
                        goto exit;