Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/modutils/depmod.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/modutils/depmod.c (modified) (10 diffs)

branches/3.3/mindi-busybox/modutils/depmod.c

@@ -22 +22 @@
  */
 
-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);
@@ -45 +36 @@
 
     image = xmalloc_open_zipped_read_close(fname, &len);
-    info = xzalloc(sizeof(*info));
-
-    info->next = *first;
-    *first = info;
-
-    info->dnext = info->dprev = info;
-    info->name = xstrdup(fname + 2); /* skip "./" */
-    info->modname = xstrdup(filename2modname(fname, modname));
+
+    e = moddb_get_or_create(modules, bb_get_last_path_component_nostrip(fname));
+    e->name = xstrdup(fname + 2); /* skip "./" */
+
     for (ptr = image; ptr < image + len - 10; ptr++) {
-        if (strncmp(ptr, "depends=", 8) == 0) {
+        if (is_prefixed_with(ptr, "depends=")) {
             char *u;
 
@@ -61 +48 @@
                 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);
         }
@@ -85 +72 @@
 }
 
-static module_info *find_module(module_info *modules, const char *modname)
-{
-    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;
+static void order_dep_list(module_db *modules, module_entry *start, llist_t *add)
+{
+    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;
@@ -117 +93 @@
 
         /* recurse */
-        order_dep_list(modules, start, m->dependencies);
+        order_dep_list(modules, start, m->deps);
     }
 }
@@ -183 +159 @@
 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 *moddir, *version;
     struct utsname uts;
+    unsigned i;
     int tmp;
 
@@ -210 +188 @@
 
     /* Scan modules */
-    modules = NULL;
+    memset(&modules, 0, sizeof(modules));
     if (*argv) {
         do {
@@ -223 +201 @@
     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;
@@ -242 +221 @@
     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);
         }
     }
@@ -260 +238 @@
     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;