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;
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;
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)
int j;
uname(&ver);
- path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(ver.release) + 1);
- sprintf(path, DEF_MOD_PATH "*.ko", ver.release);
+ path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(prefix) + strlen(ver.release) + 1);
+ sprintf(path, "%s" DEF_MOD_PATH "*.ko", prefix, ver.release);
if (glob(path, gl_flags, NULL, &gl) < 0)
return -1;
cur += sprintf(cur, "%s", argv[i]);
}
+ if (!get_module_path(name)) {
+ fprintf(stderr, "Failed to find %s. Maybe it is a built in module ?\n", name);
+ return -1;
+ }
+
ret = insert_module(get_module_path(name), options);
free(options);
static int main_modinfo(int argc, char **argv)
{
- char *module;
+ struct module *m;
+ char *name;
if (argc != 2)
return print_usage("modinfo");
- module = get_module_path(argv[1]);
- if (!module) {
+ if (scan_module_folder())
+ return -1;
+
+ name = get_module_name(argv[1]);
+ m = find_module(name);
+ if (!m) {
LOG("cannot find module - %s\n", argv[1]);
return -1;
}
- print_modinfo(module);
+ name = get_module_path(m->name);
+ if (!name) {
+ LOG("cannot find path of module - %s\n", m->name);
+ return -1;
+ }
+
+ print_modinfo(name);
return 0;
}