#include <glob.h>
#include <elf.h>
-#include <libubox/list.h>
+#include <libubox/avl.h>
+#include <libubox/avl-cmp.h>
+#include <libubox/utils.h>
#define DEF_MOD_PATH "/lib/modules/%s/"
};
struct module {
- struct list_head list;
+ struct avl_node avl;
char *name;
char *depends;
int state;
};
-static LIST_HEAD(modules);
+static struct avl_tree modules;
+static char *prefix = "";
-static struct module* find_module(char *name)
+static struct module *find_module(const char *name)
{
- struct module *m = NULL;
-
- list_for_each_entry(m, &modules, list)
- if (!strcmp(m->name, name))
- return m;
- return NULL;
-}
-
-static void free_module(struct module *m)
-{
- if (m->name)
- free(m->name);
- if (m->depends)
- free(m->depends);
- free(m);
+ struct module *m;
+ return avl_find_element(&modules, name, m, avl);
}
static void free_modules(void)
{
- struct list_head *p, *n;
+ struct module *m, *tmp;
- list_for_each_safe(p, n, &modules) {
- struct module *m = container_of(p, struct module, list);
- list_del(p);
- free_module(m);
- }
+ avl_remove_all_elements(&modules, m, avl, tmp)
+ free(m);
}
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;
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;
}
#endif
+static struct module *
+alloc_module(const char *name, const char *depends, int size)
+{
+ struct module *m;
+ char *_name, *_dep;
+
+ m = calloc_a(sizeof(*m),
+ &_name, strlen(name) + 1,
+ &_dep, depends ? strlen(depends) + 1 : 0);
+ if (!m)
+ return NULL;
+
+ m->avl.key = m->name = strcpy(_name, name);
+ if (depends)
+ m->depends = strcpy(_dep, depends);
+
+ m->size = size;
+ avl_insert(&modules, &m->avl);
+ return m;
+}
+
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;
if (!m.name || !m.depends)
continue;
- n = malloc(sizeof(struct module));
- if (!n)
- continue;
-
- n->name = strdup(m.name);
- n->depends = strdup(m.depends);
- n->size = m.size;
+ n = alloc_module(m.name, m.depends, m.size);
n->usage = m.usage;
n->state = LOADED;
-
- list_add_tail(&n->list, &modules);
}
+ free(buf);
+ fclose(fp);
return 0;
}
-static struct module* get_module_info(char *module)
+static struct module* get_module_info(const char *module, const char *name)
{
int fd = open(module, O_RDONLY);
unsigned int offset, size;
- char *map, *strings;
+ char *map, *strings, *dep = NULL;
struct module *m;
struct stat s;
}
strings = map + offset;
- m = malloc(sizeof(struct module));
- if (!m)
- return NULL;
-
- memset(m, 0, sizeof(struct module));
- m->size = s.st_size;
while (strings && (strings < map + offset + size)) {
char *sep;
int len;
len = sep - strings;
sep++;
if (!strncmp(strings, "depends=", len + 1))
- m->depends = strdup(sep);
+ dep = sep;
strings = &sep[strlen(sep)];
}
+ m = alloc_module(name, dep, s.st_size);
+ if (!m)
+ return NULL;
+
m->state = SCANNED;
return m;
continue;
m = find_module(name);
- if (!m) {
- m = get_module_info(gl.gl_pathv[j]);
- m->name = strdup(name);
- list_add_tail(&m->list, &modules);
- }
+ if (!m)
+ get_module_info(gl.gl_pathv[j], name);
}
globfree(&gl);
do {
loaded = 0;
todo = 0;
- list_for_each_entry(m, &modules, list) {
+ avl_for_each_element(&modules, m, avl) {
if ((m->state == PROBE) && (!deps_available(m))) {
if (!insert_module(get_module_path(m->name), "")) {
m->state = LOADED;
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();
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]);
+ }
- return insert_module(get_module_path(name), options);
+ ret = insert_module(get_module_path(name), options);
+ free(options);
+
+ return ret;
}
static int main_rmmod(int argc, char **argv)
if (scan_loaded_modules())
return -1;
- list_for_each_entry(m, &modules, list)
+ avl_for_each_element(&modules, m, avl)
if (m->state == LOADED)
printf("%-20s%8d%3d %s\n",
m->name, m->size, m->usage,
{
struct utsname ver;
struct module *m;
- char path[128];
+ char *path;
char *name;
if (argc != 2)
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);
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, "*");
+ scan_loaded_modules();
+
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');
- 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';
- 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);
{
char *exec = basename(*argv);
+ avl_init(&modules, avl_strcmp, false, NULL);
if (!strcmp(exec, "insmod"))
return main_insmod(argc, argv);
projects / project / ubox.git / blobdiff