X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=udevtrigger.c;h=5a9acacbcdf6acd633cf99591b19d73877409ba7;hb=3a698a2a1aad368d33b08d405fbc44d39f63982a;hp=98b074349ab45c889f911e80e92e8c8182fad7d0;hpb=782013924f28b9ebadfcd9d1719939bcc344c548;p=project%2Fprocd.git

diff --git a/udevtrigger.c b/udevtrigger.c
index 98b0743..5a9acac 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -179,26 +179,42 @@ 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;
 
 	dir = opendir(base);
-	if (dir != NULL) {
-		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-			char dirname[PATH_SIZE];
+	if (dir == NULL)
+		return;
 
-			if (dent->d_name[0] == '.')
-				continue;
+	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));
 
-			strlcpy(dirname, base, sizeof(dirname));
-			strlcat(dirname, "/", sizeof(dirname));
-			strlcat(dirname, dent->d_name, sizeof(dirname));
-			device_list_insert(dirname);
+		if (insert) {
+			int err;
+
+			err = device_list_insert(dirname);
+			if (err)
+				continue;
 		}
-		closedir(dir);
+
+		if (subdir)
+			strlcat(dirname, subdir, sizeof(base));
+
+		if (depth)
+			scan_subdir(dirname, NULL, true, depth - 1);
 	}
+
+	closedir(dir);
 }
 
 static void scan_subsystem(const char *subsys)
@@ -211,23 +227,25 @@ static void scan_subsystem(const char *subsys)
 	strlcat(base, subsys, sizeof(base));
 
 	dir = opendir(base);
-	if (dir != NULL) {
-		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-			char dirname[PATH_SIZE];
+	if (dir == NULL)
+		return;
 
-			if (dent->d_name[0] == '.')
-				continue;
+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+		char dirname[PATH_SIZE];
 
-			strlcpy(dirname, base, sizeof(dirname));
-			strlcat(dirname, "/", sizeof(dirname));
-			strlcat(dirname, dent->d_name, sizeof(dirname));
-			strlcat(dirname, "/devices", sizeof(dirname));
+		if (dent->d_name[0] == '.')
+			continue;
 
-			/* look for devices */
-			scan_subdir(dirname);
-		}
-		closedir(dir);
+		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, NULL, true, 0);
 	}
+
+	closedir(dir);
 }
 
 static void scan_block(void)
@@ -239,24 +257,26 @@ static void scan_block(void)
 	strlcpy(base, "/sys/block", sizeof(base));
 
 	dir = opendir(base);
-	if (dir != NULL) {
-		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-			char dirname[PATH_SIZE];
+	if (dir == NULL)
+		return;
 
-			if (dent->d_name[0] == '.')
-				continue;
+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+		char dirname[PATH_SIZE];
 
-			strlcpy(dirname, base, sizeof(dirname));
-			strlcat(dirname, "/", sizeof(dirname));
-			strlcat(dirname, dent->d_name, sizeof(dirname));
-			if (device_list_insert(dirname) != 0)
-				continue;
+		if (dent->d_name[0] == '.')
+			continue;
 
-			/* look for partitions */
-			scan_subdir(dirname);
-		}
-		closedir(dir);
+		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, NULL, true, 0);
 	}
+
+	closedir(dir);
 }
 
 static void scan_class(void)
@@ -268,26 +288,27 @@ static void scan_class(void)
 	strlcpy(base, "/sys/class", sizeof(base));
 
 	dir = opendir(base);
-	if (dir != NULL) {
-		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-			char dirname[PATH_SIZE];
+	if (dir == NULL)
+		return;
 
-			if (dent->d_name[0] == '.')
-				continue;
+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+		char dirname[PATH_SIZE];
 
-			strlcpy(dirname, base, sizeof(dirname));
-			strlcat(dirname, "/", sizeof(dirname));
-			strlcat(dirname, dent->d_name, sizeof(dirname));
+		if (dent->d_name[0] == '.')
+			continue;
 
-			scan_subdir(dirname);
-		}
-		closedir(dir);
+		strlcpy(dirname, base, sizeof(dirname));
+		strlcat(dirname, "/", sizeof(dirname));
+		strlcat(dirname, dent->d_name, sizeof(dirname));
+
+		scan_subdir(dirname, NULL, true, 0);
 	}
+
+	closedir(dir);
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
-	char base[PATH_SIZE];
 	struct stat statbuf;
 	int option;
 
@@ -323,8 +344,7 @@ int main(int argc, char *argv[], char *envp[])
 	scan_class();
 
 	/* scan "block" if it isn't a "class" */
-	strlcpy(base, "/sys/class/block", sizeof(base));
-	if (stat(base, &statbuf) != 0)
+	if (stat("/sys/class/block", &statbuf) != 0)
 		scan_block();
 
 exit: