X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=49899b3ade0ef5b418e60005135d107a6dd09266;hp=06338006408c4d5f2eee58384ec7ab496b632af5;hb=beadcb4dcee83fbf23c481725602ecd82470ad0d;hpb=4bc5ee5ed0cdf530dc96143bcba5726f127644f3

diff --git a/kmodloader.c b/kmodloader.c
index 0633800..49899b3 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -56,6 +56,7 @@ struct module {
 };
 
 static struct avl_tree modules;
+static char *prefix = "";
 
 static struct module *find_module(const char *name)
 {
@@ -82,7 +83,7 @@ static char* get_module_path(char *name)
 		return name;
 
 	uname(&ver);
-	snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name);
+	snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
 
 	if (!stat(path, &s))
 		return path;
@@ -94,7 +95,7 @@ static char* get_module_path(char *name)
 		t++;
 	}
 
-	snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name);
+	snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
 
 	if (!stat(path, &s))
 		return path;
@@ -191,15 +192,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 +218,8 @@ static int scan_loaded_modules(void)
 		n->usage = m.usage;
 		n->state = LOADED;
 	}
+	free(buf);
+	fclose(fp);
 
 	return 0;
 }
@@ -452,9 +457,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 +480,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 +568,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 +578,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,10 +606,14 @@ 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];
 
+	if (argc > 2)
+		prefix = argv[2];
+
 	path = malloc(strlen(dir) + 2);
 	strcpy(path, dir);
 	strcat(path, "*");
@@ -602,39 +622,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);