1303 files changed, 32187 insertions, 57138 deletions
diff --git a/modutils/depmod.c b/modutils/depmod.c index 1455d94..b7965eb 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -7,8 +7,20 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//config:config DEPMOD +//config: bool "depmod" +//config: default y +//config: select PLATFORM_LINUX +//config: help +//config: depmod generates modules.dep (and potentially modules.alias +//config: and modules.symbols) that contain dependency information +//config: for modprobe. -//applet:IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP)) +//applet:IF_DEPMOD(IF_NOT_MODPROBE_SMALL(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))) + +//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y) +//kbuild:lib-$(CONFIG_DEPMOD) += depmod.o modutils.o +//kbuild:endif #include "libbb.h" #include "modutils.h" @@ -21,22 +33,13 @@ * for each depends, look through our list of full paths and emit if found */ -typedef struct module_info { - struct module_info *next; - char *name, *modname; - llist_t *dependencies; - llist_t *aliases; - llist_t *symbols; - struct module_info *dnext, *dprev; -} module_info; - static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM, void *data, int depth UNUSED_PARAM) { - char modname[MODULE_NAME_LEN]; - module_info **first = (module_info **) data; + module_db *modules = data; char *image, *ptr; - module_info *info; + module_entry *e; + /* Arbitrary. Was sb->st_size, but that breaks .gz etc */ size_t len = (64*1024*1024 - 4096); @@ -44,41 +47,34 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA return TRUE; image = xmalloc_open_zipped_read_close(fname, &len); - info = xzalloc(sizeof(*info)); - info->next = *first; - *first = info; + e = moddb_get_or_create(modules, bb_get_last_path_component_nostrip(fname)); + e->name = xstrdup(fname + 2); /* skip "./" */ - info->dnext = info->dprev = info; - if (strncmp(fname, "./", 2) == 0) - info->name = xstrdup(fname + 2); - else - info->name = xstrdup(fname); - info->modname = xstrdup(filename2modname(fname, modname)); for (ptr = image; ptr < image + len - 10; ptr++) { - if (strncmp(ptr, "depends=", 8) == 0) { + if (is_prefixed_with(ptr, "depends=")) { char *u; ptr += 8; for (u = ptr; *u; u++) if (*u == '-') *u = '_'; - ptr += string_to_llist(ptr, &info->dependencies, ","); + ptr += string_to_llist(ptr, &e->deps, ","); } else if (ENABLE_FEATURE_MODUTILS_ALIAS - && strncmp(ptr, "alias=", 6) == 0 + && is_prefixed_with(ptr, "alias=") ) { - llist_add_to(&info->aliases, xstrdup(ptr + 6)); + llist_add_to(&e->aliases, xstrdup(ptr + 6)); ptr += strlen(ptr); } else if (ENABLE_FEATURE_MODUTILS_SYMBOLS - && strncmp(ptr, "__ksymtab_", 10) == 0 + && is_prefixed_with(ptr, "__ksymtab_") ) { ptr += 10; - if (strncmp(ptr, "gpl", 3) == 0 + if (is_prefixed_with(ptr, "gpl") || strcmp(ptr, "strings") == 0 ) { continue; } - llist_add_to(&info->symbols, xstrdup(ptr)); + llist_add_to(&e->symbols, xstrdup(ptr)); ptr += strlen(ptr); } } @@ -87,24 +83,13 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA return TRUE; } -static module_info *find_module(module_info *modules, const char *modname) +static void order_dep_list(module_db *modules, module_entry *start, llist_t *add) { - module_info *m; - - for (m = modules; m != NULL; m = m->next) - if (strcmp(m->modname, modname) == 0) - return m; - return NULL; -} - -static void order_dep_list(module_info *modules, module_info *start, - llist_t *add) -{ - module_info *m; + module_entry *m; llist_t *n; for (n = add; n != NULL; n = n->link) { - m = find_module(modules, n->data); + m = moddb_get(modules, n->data); if (m == NULL) continue; @@ -119,7 +104,7 @@ static void order_dep_list(module_info *modules, module_info *start, start->dprev = m; /* recurse */ - order_dep_list(modules, start, m->dependencies); + order_dep_list(modules, start, m->deps); } } @@ -130,10 +115,11 @@ static void xfreopen_write(const char *file, FILE *f) } //usage:#if !ENABLE_MODPROBE_SMALL -//usage:#define depmod_trivial_usage "[-n] [MODFILES]..." +//usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..." //usage:#define depmod_full_usage "\n\n" //usage: "Generate modules.dep, alias, and symbols files" //usage: "\n" +//usage: "\n -b BASE Use BASE/lib/modules/VERSION" //usage: "\n -n Dry run: print files to stdout" //usage:#endif @@ -184,11 +170,12 @@ enum { int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int depmod_main(int argc UNUSED_PARAM, char **argv) { - module_info *modules, *m, *dep; + module_db modules; + module_entry *m, *dep; const char *moddir_base = "/"; - char *version; + char *moddir, *version; struct utsname uts; - struct stat info; + unsigned i; int tmp; getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); @@ -206,13 +193,13 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) uname(&uts); version = uts.release; } - xchdir(&CONFIG_DEFAULT_MODULES_DIR[1]); - if (stat(version, &info) == 0) { - xchdir(version); - } + moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version); + xchdir(moddir); + if (ENABLE_FEATURE_CLEAN_UP) + free(moddir); /* Scan modules */ - modules = NULL; + memset(&modules, 0, sizeof(modules)); if (*argv) { do { parse_module(*argv, /*sb (unused):*/ NULL, &modules, 0); @@ -225,10 +212,11 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) /* Generate dependency and alias files */ if (!(option_mask32 & OPT_n)) xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout); - for (m = modules; m != NULL; m = m->next) { + + moddb_foreach_module(&modules, m, i) { printf("%s:", m->name); - order_dep_list(modules, m, m->dependencies); + order_dep_list(&modules, m, m->deps); while (m->dnext != m) { dep = m->dnext; printf(" %s", dep->name); @@ -244,44 +232,34 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_MODUTILS_ALIAS if (!(option_mask32 & OPT_n)) xfreopen_write("modules.alias", stdout); - for (m = modules; m != NULL; m = m->next) { - const char *fname = bb_basename(m->name); - int fnlen = strchrnul(fname, '.') - fname; + moddb_foreach_module(&modules, m, i) { while (m->aliases) { - /* Last word can well be m->modname instead, - * but depmod from module-init-tools 3.4 - * uses module basename, i.e., no s/-/_/g. - * (pathname and .ko.* are still stripped) - * Mimicking that... */ - printf("alias %s %.*s\n", + /* + * Last word used to be a basename + * (filename with path and .ko.* stripped) + * at the time of module-init-tools 3.4. + * kmod v.12 uses module name, i.e., s/-/_/g. + */ + printf("alias %s %s\n", (char*)llist_pop(&m->aliases), - fnlen, fname); + m->modname); } } #endif #if ENABLE_FEATURE_MODUTILS_SYMBOLS if (!(option_mask32 & OPT_n)) xfreopen_write("modules.symbols", stdout); - for (m = modules; m != NULL; m = m->next) { - const char *fname = bb_basename(m->name); - int fnlen = strchrnul(fname, '.') - fname; + moddb_foreach_module(&modules, m, i) { while (m->symbols) { - printf("alias symbol:%s %.*s\n", + printf("alias symbol:%s %s\n", (char*)llist_pop(&m->symbols), - fnlen, fname); + m->modname); } } #endif - if (ENABLE_FEATURE_CLEAN_UP) { - while (modules) { - module_info *old = modules; - modules = modules->next; - free(old->name); - free(old->modname); - free(old); - } - } + if (ENABLE_FEATURE_CLEAN_UP) + moddb_free(&modules); return EXIT_SUCCESS; } |