syslog: fix incorrect use of sizeof() in vsnprintf()

[project/procd.git] / udevtrigger.c

diff --git a/udevtrigger.c b/udevtrigger.c
index 08ddb06..5013189 100644 (file)
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -217,75 +217,6 @@ static void scan_subdir(const char *base, const char *subdir,
        closedir(dir);
 }
 
-static void scan_subsystem(const char *subsys)
-{
-       char base[PATH_SIZE];
-
-       strlcpy(base, "/sys/", sizeof(base));
-       strlcat(base, subsys, sizeof(base));
-
-       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, NULL, true, 0);
-       }
-
-       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;
-
-               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[])
 {
        struct stat statbuf;
@@ -319,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: