X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=udevtrigger.c;h=5013189530a1741b8bfd8f3c9db85085124477f8;hp=2f1af35488159d1ae10002a3907a9cdda5cc8556;hb=f51f9cc5738d340423e44e678829402b367cf866;hpb=583568b22fbab0d6d6128433cedf7f1a88c183c1

diff --git a/udevtrigger.c b/udevtrigger.c
index 2f1af35..5013189 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -179,7 +179,8 @@ static int device_list_insert(const char *path)
 	return 0;
 }
 
-static void scan_subdir(const char *base)
+static void scan_subdir(const char *base, const char *subdir,
+		        bool insert, int depth)
 {
 	DIR *dir;
 	struct dirent *dent;
@@ -197,97 +198,20 @@ static void scan_subdir(const char *base)
 		strlcpy(dirname, base, sizeof(dirname));
 		strlcat(dirname, "/", sizeof(dirname));
 		strlcat(dirname, dent->d_name, sizeof(dirname));
-		device_list_insert(dirname);
-	}
-
-	closedir(dir);
-}
-
-static void scan_subsystem(const char *subsys)
-{
-	char base[PATH_SIZE];
-	DIR *dir;
-	struct dirent *dent;
-
-	strlcpy(base, "/sys/", sizeof(base));
-	strlcat(base, subsys, sizeof(base));
-
-	dir = opendir(base);
-	if (dir == NULL)
-		return;
-
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char dirname[PATH_SIZE];
-
-		if (dent->d_name[0] == '.')
-			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 */
-		scan_subdir(dirname);
-	}
-
-	closedir(dir);
-}
-
-static void scan_block(void)
-{
-	char base[PATH_SIZE];
-	DIR *dir;
-	struct dirent *dent;
-
-	strlcpy(base, "/sys/block", sizeof(base));
-
-	dir = opendir(base);
-	if (dir == NULL)
-		return;
-
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char dirname[PATH_SIZE];
-
-		if (dent->d_name[0] == '.')
-			continue;
-
-		strlcpy(dirname, base, sizeof(dirname));
-		strlcat(dirname, "/", sizeof(dirname));
-		strlcat(dirname, dent->d_name, sizeof(dirname));
-		if (device_list_insert(dirname) != 0)
-			continue;
 
-		/* look for partitions */
-		scan_subdir(dirname);
-	}
+		if (insert) {
+			int err;
 
-	closedir(dir);
-}
-
-static void scan_class(void)
-{
-	char base[PATH_SIZE];
-	DIR *dir;
-	struct dirent *dent;
-
-	strlcpy(base, "/sys/class", sizeof(base));
-
-	dir = opendir(base);
-	if (dir == NULL)
-		return;
-
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char dirname[PATH_SIZE];
-
-		if (dent->d_name[0] == '.')
-			continue;
+			err = device_list_insert(dirname);
+			if (err)
+				continue;
+		}
 
-		strlcpy(dirname, base, sizeof(dirname));
-		strlcat(dirname, "/", sizeof(dirname));
-		strlcat(dirname, dent->d_name, sizeof(dirname));
+		if (subdir)
+			strlcat(dirname, subdir, sizeof(base));
 
-		scan_subdir(dirname);
+		if (depth)
+			scan_subdir(dirname, NULL, true, depth - 1);
 	}
 
 	closedir(dir);
@@ -326,12 +250,12 @@ int main(int argc, char *argv[], char *envp[])
 
 
 	/* if we have /sys/subsystem, forget all the old stuff */
-	scan_subsystem("bus");
-	scan_class();
+	scan_subdir("/sys/bus", "/devices", false, 1);
+	scan_subdir("/sys/class", NULL, false, 1);
 
 	/* scan "block" if it isn't a "class" */
 	if (stat("/sys/class/block", &statbuf) != 0)
-		scan_block();
+		scan_subdir("/sys/block", NULL, true, 1);
 
 exit: