/*
- * 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
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);
return 0;
}
-int udevadm_trigger(struct udev *udev, int argc, char *argv[])
+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;
+}
+
+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' },
- { "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' },
+ { "parent-match", required_argument, NULL, 'b' },
{ "help", no_argument, NULL, 'h' },
{}
};
TYPE_SUBSYSTEMS,
TYPE_FAILED,
} device_type = TYPE_DEVICES;
- const char *action = "add";
+ const char *action = "change";
struct udev_enumerate *udev_enumerate;
int rc = 0;
goto exit;
}
- while (1) {
+ for (;;) {
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, "vng:o:t:hc:p:s:S:a:A:y:b:", options, NULL);
if (option == -1)
break;
} 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;
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_sysattr(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];
+ 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 'g':
+ udev_enumerate_add_match_tag(udev_enumerate, optarg);
+ break;
+ case 'y':
+ udev_enumerate_add_match_sysname(udev_enumerate, optarg);
+ break;
+ case 'b': {
+ char path[UTIL_PATH_SIZE];
+ struct udev_device *dev;
+
+ /* add sys dir if needed */
+ if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
+ util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), optarg, NULL);
+ else
+ util_strscpy(path, sizeof(path), optarg);
+ util_remove_trailing_chars(path, '/');
+ dev = udev_device_new_from_syspath(udev, path);
+ if (dev == NULL) {
+ err(udev, "unable to open the device '%s'\n", optarg);
+ rc = 2;
+ goto exit;
}
- udev_enumerate_add_nomatch_sysattr(udev_enumerate, attr, val);
+ udev_enumerate_add_match_parent(udev_enumerate, dev);
+ /* drop reference immediately, enumerate pins the device as long as needed */
+ udev_device_unref(dev);
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"
- " --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"
- " --help print this text\n"
- "\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;
default:
+ rc = 1;
goto exit;
}
}
switch (device_type) {
case TYPE_FAILED:
+ err(udev, "--type=failed is deprecated and will be removed from a future udev release.\n");
scan_failed(udev_enumerate);
exec_list(udev_enumerate, action);
goto exit;
udev_enumerate_unref(udev_enumerate);
return rc;
}
+
+const struct udevadm_cmd udevadm_trigger = {
+ .name = "trigger",
+ .cmd = adm_trigger,
+ .help = "request events from the kernel",
+};
~ianmdlvl / elogind.git / blobdiff