X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-trigger.c;h=2e9fe6ba96cc79a5e5435c5dc0c5ab1948d400bb;hb=9060b066d9e7aaca9795010ac5fff61018947f87;hp=15e7dc17fb88d7b0da4e20f3a6946063d9012983;hpb=1d59ba40772517ad92212c89f34529c943c9a849;p=elogind.git

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 15e7dc17f..2e9fe6ba9 100644
--- 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,22 +165,16 @@ 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_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 'h':
 			printf("Usage: udevadm trigger OPTIONS\n"
@@ -181,6 +190,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 			       "  --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"
 			       "  --help\n\n");
 			goto exit;
 		default: