X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevtrigger.c;h=e530a61c0bf5a35e3c24d334d98d83a7b93e1dc4;hb=cea61f5c0303d7e2f0886688e789c091d7e4b9e2;hp=bc8453a82a9c2566a78aaa1ac32a8e7c4e864135;hpb=0d5be398ffd2f47e0b97f33ca2fd96319ee16c9d;p=elogind.git

diff --git a/udevtrigger.c b/udevtrigger.c
index bc8453a82..e530a61c0 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 
 #include "udev.h"
+#include "udevd.h"
 
-static const char *udev_log_str;
 static int verbose;
 static int dry_run;
 
@@ -74,16 +74,17 @@ LIST_HEAD(device_last_list);
 static int device_list_insert(const char *path)
 {
 	struct list_head *device_list = &device_default_list;
+	const char *devpath = &path[strlen(sysfs_path)];
 	int i;
 
 	for (i = 0; first_list[i] != NULL; i++) {
-		if (strncmp(path, first_list[i], strlen(first_list[i])) == 0) {
+		if (strncmp(devpath, first_list[i], strlen(first_list[i])) == 0) {
 			device_list = &device_first_list;
 			break;
 		}
 	}
 	for (i = 0; last_list[i] != NULL; i++) {
-		if (strncmp(path, last_list[i], strlen(last_list[i])) == 0) {
+		if (strncmp(devpath, last_list[i], strlen(last_list[i])) == 0) {
 			device_list = &device_last_list;
 			break;
 		}
@@ -165,7 +166,7 @@ static int is_device(const char *path)
 	return 1;
 }
 
-static void udev_scan_bus(void)
+static void scan_bus(void)
 {
 	char base[PATH_SIZE];
 	DIR *dir;
@@ -212,7 +213,7 @@ static void udev_scan_bus(void)
 	}
 }
 
-static void udev_scan_block(void)
+static void scan_block(void)
 {
 	char base[PATH_SIZE];
 	DIR *dir;
@@ -271,7 +272,7 @@ static void udev_scan_block(void)
 	}
 }
 
-static void udev_scan_class(void)
+static void scan_class(void)
 {
 	char base[PATH_SIZE];
 	DIR *dir;
@@ -317,38 +318,84 @@ static void udev_scan_class(void)
 	}
 }
 
+static void scan_failed(void)
+{
+	char base[PATH_SIZE];
+	DIR *dir;
+	struct dirent *dent;
+
+	strlcpy(base, udev_root, sizeof(base));
+	strlcat(base, "/", sizeof(base));
+	strlcat(base, EVENT_FAILED_DIR, sizeof(base));
+
+	dir = opendir(base);
+	if (dir != NULL) {
+		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+			char linkname[PATH_SIZE];
+			char target[PATH_SIZE];
+			int len;
+
+			if (dent->d_name[0] == '.')
+				continue;
+
+			strlcpy(linkname, base, sizeof(linkname));
+			strlcat(linkname, "/", sizeof(linkname));
+			strlcat(linkname, dent->d_name, sizeof(linkname));
+
+			len = readlink(linkname, target, sizeof(target));
+			if (len <= 0)
+				continue;
+			target[len] = '\0';
+
+			if (is_device(target))
+				device_list_insert(target);
+			else
+				continue;
+		}
+		closedir(dir);
+	}
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	int i;
+	int failed = 0;
 
 	logging_init("udevtrigger");
 	udev_config_init();
 	dbg("version %s", UDEV_VERSION);
-
-	udev_log_str = getenv("UDEV_LOG");
+	sysfs_init();
 
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];
 
-		if (strcmp(arg, "--verbose") == 0 || strcmp(arg, "-v") == 0)
+		if (strcmp(arg, "--verbose") == 0 || strcmp(arg, "-v") == 0) {
 			verbose = 1;
-		else if (strcmp(arg, "--dry-run") == 0 || strcmp(arg, "-n") == 0)
+		} else if (strcmp(arg, "--dry-run") == 0 || strcmp(arg, "-n") == 0) {
 			dry_run = 1;
-		else {
-			fprintf(stderr, "Usage: udevtrigger [--verbose] [--dry-run]\n");
+		} else if (strcmp(arg, "--retry-failed") == 0 || strcmp(arg, "-F") == 0) {
+			failed = 1;
+		} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
+			printf("Usage: udevtrigger [--help] [--verbose] [--dry-run] [--retry-failed]\n");
 			goto exit;
+		} else {
+			fprintf(stderr, "unrecognized option '%s'\n", arg);
+			err("unrecognized option '%s'\n", arg);
 		}
 	}
 
-	sysfs_init();
-
-	udev_scan_bus();
-	udev_scan_class();
-	udev_scan_block();
+	if (failed)
+		scan_failed();
+	else {
+		/* default action */
+		scan_bus();
+		scan_class();
+		scan_block();
+	}
 	exec_lists();
 
-	sysfs_cleanup();
 exit:
+	sysfs_cleanup();
 	logging_close();
 	return 0;
 }