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;
}
+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[] = {
{ "subsystem-nomatch", required_argument, NULL, 'S' },
{ "attr-match", required_argument, NULL, 'a' },
{ "attr-nomatch", required_argument, NULL, 'A' },
+ { "property-match", required_argument, NULL, 'p' },
+ { "sysname-match", required_argument, NULL, 'y' },
{ "help", no_argument, NULL, 'h' },
{}
};
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:y:", options, NULL);
if (option == -1)
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];
- }
- udev_enumerate_add_nomatch_sysattr(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 'y':
+ udev_enumerate_add_match_sysname(udev_enumerate, optarg);
break;
case 'h':
printf("Usage: udevadm trigger OPTIONS\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"
+ " --property-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;
default: