block: ignore probe entries without id

[project/ubox.git] / kmodloader.c

diff --git a/kmodloader.c b/kmodloader.c
index 0633800..049a868 100644 (file)
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -191,15 +191,17 @@ alloc_module(const char *name, const char *depends, int size)
 
 static int scan_loaded_modules(void)
 {
-       FILE *fp = fopen("/proc/modules", "r");
-       char buf[256];
+       size_t buf_len = 0;
+       char *buf = NULL;
+       FILE *fp;
 
+       fp = fopen("/proc/modules", "r");
        if (!fp) {
                fprintf(stderr, "failed to open /proc/modules\n");
                return -1;
        }
 
-       while (fgets(buf, sizeof(buf), fp)) {
+       while (getline(&buf, &buf_len, fp) > 0) {
                struct module m;
                struct module *n;
 
@@ -215,6 +217,8 @@ static int scan_loaded_modules(void)
                n->usage = m.usage;
                n->state = LOADED;
        }
+       free(buf);
+       fclose(fp);
 
        return 0;
 }
@@ -452,9 +456,8 @@ static int print_usage(char *arg)
 
 static int main_insmod(int argc, char **argv)
 {
-       char options[256] = "";
-       char *name;
-       int i;
+       char *name, *cur, *options;
+       int i, ret, len;
 
        if (argc < 2)
                return print_insmod_usage();
@@ -476,13 +479,24 @@ static int main_insmod(int argc, char **argv)
 
        free_modules();
 
-       for (i = 2; i < argc; i++)
-               if (snprintf(options, sizeof(options), "%s %s", options, argv[i]) >= sizeof(options)) {
-                       fprintf(stderr, "argument line too long - %s\n", options);
-                       return -1;
+       for (len = 0, i = 2; i < argc; i++)
+               len += strlen(argv[i]) + 1;
+
+       options = malloc(len);
+       options[0] = 0;
+       cur = options;
+       for (i = 2; i < argc; i++) {
+               if (options[0]) {
+                       *cur = ' ';
+                       cur++;
                }
+               cur += sprintf(cur, "%s", argv[i]);
+       }
+
+       ret = insert_module(get_module_path(name), options);
+       free(options);
 
-       return insert_module(get_module_path(name), options);
+       return ret;
 }
 
 static int main_rmmod(int argc, char **argv)
@@ -553,7 +567,7 @@ static int main_depmod(int argc, char **argv)
 {
        struct utsname ver;
        struct module *m;
-       char path[128];
+       char *path;
        char *name;
 
        if (argc != 2)
@@ -563,7 +577,8 @@ static int main_depmod(int argc, char **argv)
                return -1;
 
        uname(&ver);
-       snprintf(path, sizeof(path), DEF_MOD_PATH "*.ko", ver.release);
+       path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(ver.release) + 1);
+       sprintf(path, DEF_MOD_PATH "*.ko", ver.release);
 
        scan_module_folder(path);
 
@@ -590,6 +605,7 @@ static int main_loader(int argc, char **argv)
        char *dir = "/etc/modules.d/*";
        glob_t gl;
        char *path;
+       int j;
 
        if (argc > 1)
                dir = argv[1];
@@ -602,39 +618,41 @@ static int main_loader(int argc, char **argv)
 
        syslog(0, "kmodloader: loading kernel modules from %s\n", path);
 
-       if (glob(path, gl_flags, NULL, &gl) >= 0) {
-               int j;
+       if (glob(path, gl_flags, NULL, &gl) < 0)
+               goto out;
 
-               for (j = 0; j < gl.gl_pathc; j++) {
-                       FILE *fp = fopen(gl.gl_pathv[j], "r");
+       for (j = 0; j < gl.gl_pathc; j++) {
+               FILE *fp = fopen(gl.gl_pathv[j], "r");
+               size_t mod_len = 0;
+               char *mod = NULL;
 
-                       if (!fp) {
-                               fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]);
-                       } else {
-                               char mod[256];
+               if (!fp) {
+                       fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]);
+                       continue;
+               }
 
-                               while (fgets(mod, sizeof(mod), fp)) {
-                                       char *nl = strchr(mod, '\n');
-                                       struct module *m;
-                                       char *opts;
+               while (getline(&mod, &mod_len, fp) > 0) {
+                       char *nl = strchr(mod, '\n');
+                       struct module *m;
+                       char *opts;
 
-                                       if (nl)
-                                               *nl = '\0';
+                       if (nl)
+                               *nl = '\0';
 
-                                       opts = strchr(mod, ' ');
-                                       if (opts)
-                                               *opts++ = '\0';
+                       opts = strchr(mod, ' ');
+                       if (opts)
+                               *opts++ = '\0';
 
-                                       m = find_module(get_module_name(mod));
-                                       if (m)
-                                               continue;
-                                       insert_module(get_module_path(mod), (opts) ? (opts) : (""));
-                               }
-                               fclose(fp);
-                       }
+                       m = find_module(get_module_name(mod));
+                       if (m)
+                               continue;
+                       insert_module(get_module_path(mod), (opts) ? (opts) : (""));
                }
+               free(mod);
+               fclose(fp);
        }
 
+out:
        globfree(&gl);
        free(path);