udevtrigger: simplify scan_block function

[project/procd.git] / udevtrigger.c

diff --git a/udevtrigger.c b/udevtrigger.c
index 2f1af35..423df6a 100644 (file)
--- 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,7 +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);
+
+               if (insert) {
+                       int err;
+
+                       err = device_list_insert(dirname);
+                       if (err)
+                               continue;
+               }
+
+               if (subdir)
+                       strlcat(dirname, subdir, sizeof(base));
+
+               if (depth)
+                       scan_subdir(dirname, NULL, true, depth - 1);
        }
 
        closedir(dir);
@@ -206,63 +220,20 @@ static void scan_subdir(const char *base)
 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);
+       scan_subdir(base, "/devices", false, 1);
 }
 
 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);
-       }
-
-       closedir(dir);
+       scan_subdir("/sys/block", NULL, true, 1);
 }
 
 static void scan_class(void)
@@ -287,7 +258,7 @@ static void scan_class(void)
                strlcat(dirname, "/", sizeof(dirname));
                strlcat(dirname, dent->d_name, sizeof(dirname));
 
-               scan_subdir(dirname);
+               scan_subdir(dirname, NULL, true, 0);
        }
 
        closedir(dir);