move syslog wrapper to libudev

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

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index eb46a2983c046a427134d14036eb66d689e72885..2e9fe6ba96cc79a5e5435c5dc0c5ab1948d400bb 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -49,8 +49,7 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
                        printf("%s\n", udev_list_entry_get_name(entry));
                if (dry_run)
                        continue;
-               util_strlcpy(filename, udev_list_entry_get_name(entry), sizeof(filename));
-               util_strlcat(filename, "/uevent", sizeof(filename));
+               util_strscpyl(filename, sizeof(filename), udev_list_entry_get_name(entry), "/uevent", NULL);
                fd = open(filename, O_WRONLY);
                if (fd < 0) {
                        dbg(udev, "error on opening %s: %m\n", filename);
@@ -76,6 +75,20 @@ static int scan_failed(struct udev_enumerate *udev_enumerate)
        return 0;
 }
 
+static const char *keyval(const char *str, const char **val, char *buf, size_t size)
+{
+       char *pos;
+
+       util_strscpy(buf, size,str);
+       pos = strchr(buf, '=');
+       if (pos != NULL) {
+               pos[0] = 0;
+               pos++;
+       }
+       *val = pos;
+       return buf;
+}
+
 int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 {
        static const struct option options[] = {
@@ -88,6 +101,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                { "subsystem-nomatch", required_argument, NULL, 'S' },
                { "attr-match", required_argument, NULL, 'a' },
                { "attr-nomatch", required_argument, NULL, 'A' },
+               { "property-match", required_argument, NULL, 'p' },
                { "help", no_argument, NULL, 'h' },
                {}
        };
@@ -109,10 +123,11 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 
        while (1) {
                int option;
-               char attr[UTIL_PATH_SIZE];
-               char *val;
+               const char *key;
+               const char *val;
+               char buf[UTIL_PATH_SIZE];
 
-               option = getopt_long(argc, argv, "vnFo:t:hce::s:S:a:A:", options, NULL);
+               option = getopt_long(argc, argv, "vnFo:t:hcp:s:S:a:A:", options, NULL);
                if (option == -1)
                        break;
 
@@ -150,38 +165,33 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                        udev_enumerate_add_nomatch_subsystem(udev_enumerate, optarg);
                        break;
                case 'a':
-                       util_strlcpy(attr, optarg, sizeof(attr));
-                       val = strchr(attr, '=');
-                       if (val != NULL) {
-                               val[0] = 0;
-                               val = &val[1];
-                       }
-                       udev_enumerate_add_match_attr(udev_enumerate, attr, val);
+                       key = keyval(optarg, &val, buf, sizeof(buf));
+                       udev_enumerate_add_match_sysattr(udev_enumerate, key, val);
                        break;
                case 'A':
-                       util_strlcpy(attr, optarg, sizeof(attr));
-                       val = strchr(attr, '=');
-                       if (val != NULL) {
-                               val[0] = 0;
-                               val = &val[1];
-                       }
-                       udev_enumerate_add_nomatch_attr(udev_enumerate, attr, val);
+                       key = keyval(optarg, &val, buf, sizeof(buf));
+                       udev_enumerate_add_nomatch_sysattr(udev_enumerate, key, val);
+                       break;
+               case 'p':
+                       key = keyval(optarg, &val, buf, sizeof(buf));
+                       udev_enumerate_add_match_property(udev_enumerate, key, val);
                        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\n"
+                              "      devices                       sys devices (default)\n"
                               "      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"
                               "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
-                              "  --help                          print this text\n"
-                              "\n");
+                              "  --property-match=<key>=<value>  trigger devices with a matching property\n"
+                              "  --help\n\n");
                        goto exit;
                default:
                        goto exit;