X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-trigger.c;h=481e9cf163c92a8e052a7dbf127138440f6cd0ff;hp=2c4954761ee9f940c045c0859d106e137235e332;hb=88cbfb09ee5510277503ff1830ecc3aa6c380b00;hpb=8a1946ae0881ce6fb283ffa0b0dc289bbdb9bd80

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 2c4954761..481e9cf16 100644
--- 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
@@ -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);
@@ -71,32 +70,40 @@ static int scan_failed(struct udev_enumerate *udev_enumerate)
 	udev_queue = udev_queue_new(udev);
 	if (udev_queue == NULL)
 		return -1;
-	udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue)) {
-		struct udev_device *device;
+	udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue))
+		udev_enumerate_add_syspath(udev_enumerate, udev_list_entry_get_name(list_entry));
+	return 0;
+}
 
-		device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
-		if (device == NULL)
-			continue;
-		info(udev, "add '%s'\n", udev_device_get_syspath(device));
-		udev_enumerate_add_device(udev_enumerate, device);
-		udev_device_unref(device);
+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++;
 	}
-	return 0;
+	*val = pos;
+	return buf;
 }
 
 int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 {
 	static const struct option options[] = {
-		{ "verbose", 0, NULL, 'v' },
-		{ "dry-run", 0, NULL, 'n' },
-		{ "type", 1, NULL, 't' },
-		{ "retry-failed", 0, NULL, 'F' },
-		{ "action", 1, NULL, 'c' },
-		{ "subsystem-match", 1, NULL, 's' },
-		{ "subsystem-nomatch", 1, NULL, 'S' },
-		{ "attr-match", 1, NULL, 'a' },
-		{ "attr-nomatch", 1, NULL, 'A' },
-		{ "help", 0, NULL, 'h' },
+		{ "verbose", no_argument, NULL, 'v' },
+		{ "dry-run", no_argument, NULL, 'n' },
+		{ "type", required_argument, NULL, 't' },
+		{ "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' },
 		{}
 	};
 	enum {
@@ -104,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;
 
@@ -115,12 +122,13 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 		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:hcp:s:S:a:A:y:", options, NULL);
 		if (option == -1)
 			break;
 
@@ -139,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;
@@ -158,38 +162,41 @@ 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 'g':
+			udev_enumerate_add_match_tag(udev_enumerate, optarg);
+			break;
+		case 'y':
+			udev_enumerate_add_match_sysname(udev_enumerate, optarg);
 			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"
+			       "  --help\n\n");
 			goto exit;
 		default:
 			goto exit;