logd: transport log data via the new ubus fd api

[project/ubox.git] / kmodloader.c

diff --git a/kmodloader.c b/kmodloader.c
index 784021588c87ebd1a9b1f292814ee90a907722eb..770484b34cc8ecec2f8ea0d00c37249794139e32 100644 (file)
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -55,6 +55,7 @@ struct module {
 
        char *name;
        char *depends;
+       char *opts;
 
        int size;
        int usage;
@@ -111,8 +112,7 @@ static char* get_module_name(char *path)
        return name;
 }
 
-#if __WORDSIZE == 64
-static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+static int elf64_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
 {
        const char *secnames;
        Elf64_Ehdr *e;
@@ -133,8 +133,8 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset
 
        return -1;
 }
-#else
-static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+
+static int elf32_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
 {
        const char *secnames;
        Elf32_Ehdr *e;
@@ -155,7 +155,20 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset
 
        return -1;
 }
-#endif
+
+static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+{
+       int clazz = map[EI_CLASS];
+
+       if (clazz == ELFCLASS32)
+               return elf32_find_section(map, section, offset, size);
+       else if (clazz == ELFCLASS64)
+               return elf64_find_section(map, section, offset, size);
+
+       LOG("unknown elf format %d\n", clazz);
+
+       return -1;
+}
 
 static struct module *
 alloc_module(const char *name, const char *depends, int size)
@@ -170,6 +183,7 @@ alloc_module(const char *name, const char *depends, int size)
                return NULL;
 
        m->avl.key = m->name = strcpy(_name, name);
+       m->opts = 0;
 
        if (depends) {
                m->depends = strcpy(_dep, depends);
@@ -455,7 +469,7 @@ static int load_modprobe(void)
                todo = 0;
                avl_for_each_element(&modules, m, avl) {
                        if ((m->state == PROBE) && (!deps_available(m, 0))) {
-                               if (!insert_module(get_module_path(m->name), "")) {
+                               if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) {
                                        m->state = LOADED;
                                        m->error = 0;
                                        loaded++;
@@ -526,7 +540,9 @@ static int main_insmod(int argc, char **argv)
                cur += sprintf(cur, "%s", argv[i]);
        }
 
-       if (!get_module_path(name)) {
+       if (get_module_path(argv[1])) {
+               name = argv[1];
+       } else if (!get_module_path(name)) {
                fprintf(stderr, "Failed to find %s. Maybe it is a built in module ?\n", name);
                return -1;
        }
@@ -714,6 +730,8 @@ static int main_loader(int argc, char **argv)
                        if (!m || (m->state == LOADED))
                                continue;
 
+                       if (opts)
+                               m->opts = strdup(opts);
                        m->state = PROBE;
                        if (basename(gl.gl_pathv[j])[0] - '0' <= 9)
                                load_modprobe();