X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtrigger.c;h=0a9dc669097c286bac02104816947e8c6b08dbff;hp=4ef9612af070c0fe413c4070116af4ed1725dc89;hb=98520be72f9a0167df1da3c7b1a4ca2e88c3c831;hpb=285e2a24f67b1c09d7b4c54587802fc0a9d623eb

diff --git a/udevtrigger.c b/udevtrigger.c
index 4ef9612af..0a9dc6690 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -42,20 +42,6 @@ LIST_HEAD(filter_subsystem_nomatch_list);
 LIST_HEAD(filter_attr_match_list);
 LIST_HEAD(filter_attr_nomatch_list);
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
-	va_list args;
-
-	if (priority > udev_log_priority)
-		return;
-
-	va_start(args, format);
-	vsyslog(priority, format, args);
-	va_end(args);
-}
-#endif
-
 /* devices that should run last cause of their dependencies */
 static int delay_device(const char *devpath)
 {
@@ -237,11 +223,24 @@ static int attr_filtered(const char *path)
 	return 0;
 }
 
-static void scan_subsystem(const char *subsys)
+enum scan_type {
+	SCAN_DEVICES,
+	SCAN_SUBSYSTEM,
+};
+
+static void scan_subsystem(const char *subsys, enum scan_type scan)
 {
 	char base[PATH_SIZE];
 	DIR *dir;
 	struct dirent *dent;
+	const char *subdir;
+
+	if (scan == SCAN_DEVICES)
+		subdir = "/devices";
+	else if (scan == SCAN_SUBSYSTEM)
+		subdir = "/drivers";
+	else
+		return;
 
 	strlcpy(base, sysfs_path, sizeof(base));
 	strlcat(base, "/", sizeof(base));
@@ -257,15 +256,24 @@ static void scan_subsystem(const char *subsys)
 			if (dent->d_name[0] == '.')
 				continue;
 
-			if (subsystem_filtered(dent->d_name))
-				continue;
+			if (scan == SCAN_DEVICES)
+				if (subsystem_filtered(dent->d_name))
+					continue;
 
 			strlcpy(dirname, base, sizeof(dirname));
 			strlcat(dirname, "/", sizeof(dirname));
 			strlcat(dirname, dent->d_name, sizeof(dirname));
-			strlcat(dirname, "/devices", sizeof(dirname));
 
-			/* look for devices */
+			if (scan == SCAN_SUBSYSTEM) {
+				if (!subsystem_filtered("subsystem"))
+					device_list_insert(dirname);
+				if (subsystem_filtered("drivers"))
+					continue;
+			}
+
+			strlcat(dirname, subdir, sizeof(dirname));
+
+			/* look for devices/drivers */
 			dir2 = opendir(dirname);
 			if (dir2 != NULL) {
 				for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
@@ -413,6 +421,8 @@ static void scan_failed(void)
 				continue;
 
 			start = strlcpy(device, sysfs_path, sizeof(device));
+			if(start >= sizeof(device))
+				start = sizeof(device) - 1;
 			strlcat(device, dent->d_name, sizeof(device));
 			path_decode(&device[start]);
 			device_list_insert(device);
@@ -421,7 +431,7 @@ static void scan_failed(void)
 	}
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevtrigger(int argc, char *argv[], char *envp[])
 {
 	int failed = 0;
 	int option;
@@ -475,7 +485,7 @@ int main(int argc, char *argv[], char *envp[])
 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
 			break;
 		case 'h':
-			printf("Usage: udevtrigger OPTIONS\n"
+			printf("Usage: udevadm trigger OPTIONS\n"
 			       "  --verbose                       print the list of devices while running\n"
 			       "  --dry-run                       do not actually trigger the events\n"
 			       "  --retry-failed                  trigger only the events which have been\n"
@@ -494,19 +504,25 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
-	if (failed)
+	if (failed) {
 		scan_failed();
-	else {
+		exec_list(action);
+	} else {
 		char base[PATH_SIZE];
 		struct stat statbuf;
 
 		/* if we have /sys/subsystem, forget all the old stuff */
 		strlcpy(base, sysfs_path, sizeof(base));
 		strlcat(base, "/subsystem", sizeof(base));
-		if (stat(base, &statbuf) == 0)
-			scan_subsystem("subsystem");
-		else {
-			scan_subsystem("bus");
+		if (stat(base, &statbuf) == 0) {
+			scan_subsystem("subsystem", SCAN_SUBSYSTEM);
+			exec_list(action);
+			scan_subsystem("subsystem", SCAN_DEVICES);
+			exec_list(action);
+		} else {
+			scan_subsystem("bus", SCAN_SUBSYSTEM);
+			exec_list(action);
+			scan_subsystem("bus", SCAN_DEVICES);
 			scan_class();
 
 			/* scan "block" if it isn't a "class" */
@@ -514,9 +530,9 @@ int main(int argc, char *argv[], char *envp[])
 			strlcat(base, "/class/block", sizeof(base));
 			if (stat(base, &statbuf) != 0)
 				scan_block();
+			exec_list(action);
 		}
 	}
-	exec_list(action);
 
 exit:
 	name_list_cleanup(&filter_subsystem_match_list);