X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-trigger.c;h=8d25f923995bfa66733c4bddc41cc2e05c935cf1;hb=842dacb76f2f98537554683d7cccec4710779a8a;hp=67180d879e132b2b2fef922f733b09749ffd45da;hpb=f5001d2465be849306149c902a9db5b031d10428;p=elogind.git

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 67180d879..8d25f9239 100644
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -62,36 +62,17 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
 	}
 }
 
-static int enumerate_scan_failed(struct udev_enumerate *udev_enumerate)
+static int scan_failed(struct udev_enumerate *udev_enumerate)
 {
 	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
-	char base[UTIL_PATH_SIZE];
-	DIR *dir;
-	struct dirent *dent;
-
-	util_strlcpy(base, udev_get_dev_path(udev), sizeof(base));
-	util_strlcat(base, "/.udev/failed", sizeof(base));
-
-	dir = opendir(base);
-	if (dir != NULL) {
-		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-			char syspath[UTIL_PATH_SIZE];
-			size_t start;
-			struct udev_device *device;
-
-			if (dent->d_name[0] == '.')
-				continue;
-			start = util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-			util_strlcat(syspath, dent->d_name, sizeof(syspath));
-			util_path_decode(&syspath[start]);
-			device = udev_device_new_from_syspath(udev, syspath);
-			if (device == NULL)
-				continue;
-			udev_enumerate_add_device(udev_enumerate, device);
-			udev_device_unref(device);
-		}
-		closedir(dir);
-	}
+	struct udev_queue *udev_queue;
+	struct udev_list_entry *list_entry;
+
+	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))
+		udev_enumerate_add_syspath(udev_enumerate, udev_list_entry_get_name(list_entry));
 	return 0;
 }
 
@@ -100,7 +81,7 @@ 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", 0, NULL, 't' },
+		{ "type", 1, NULL, 't' },
 		{ "retry-failed", 0, NULL, 'F' },
 		{ "action", 1, NULL, 'c' },
 		{ "subsystem-match", 1, NULL, 's' },
@@ -209,7 +190,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 
 	switch (device_type) {
 	case TYPE_FAILED:
-		enumerate_scan_failed(udev_enumerate);
+		scan_failed(udev_enumerate);
 		exec_list(udev_enumerate, action);
 		goto exit;
 	case TYPE_SUBSYSTEMS: