6 files changed, 178 insertions, 121 deletions

diff --git a/modutils/depmod.c b/modutils/depmod.c
index aa228ec85..9713aef92 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -33,7 +33,6 @@ typedef struct 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;
         char *image, *ptr;
         module_info *info;
@@ -51,9 +50,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
 
         info->dnext = info->dprev = info;
         info->name = xstrdup(fname + 2); /* skip "./" */
-        info->modname = xstrdup(filename2modname(fname, modname));
+        info->modname = filename2modname(
+                        bb_get_last_path_component_nostrip(fname),
+                        NULL
+        );
         for (ptr = image; ptr < image + len - 10; ptr++) {
-                if (strncmp(ptr, "depends=", 8) == 0) {
+                if (is_prefixed_with(ptr, "depends=")) {
                         char *u;
 
                         ptr += 8;
@@ -62,15 +64,15 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
                                         *u = '_';
                         ptr += string_to_llist(ptr, &info->dependencies, ",");
                 } else if (ENABLE_FEATURE_MODUTILS_ALIAS
-                 && strncmp(ptr, "alias=", 6) == 0
+                 && is_prefixed_with(ptr, "alias=")
                 ) {
                         llist_add_to(&info->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;
@@ -242,17 +244,19 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
         if (!(option_mask32 & OPT_n))
                 xfreopen_write("modules.alias", stdout);
         for (m = modules; m != NULL; m = m->next) {
+                char modname[MODULE_NAME_LEN];
                 const char *fname = bb_basename(m->name);
-                int fnlen = strchrnul(fname, '.') - fname;
+                filename2modname(fname, modname);
                 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);
+                                modname);
                 }
         }
 #endif
@@ -260,12 +264,13 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
         if (!(option_mask32 & OPT_n))
                 xfreopen_write("modules.symbols", stdout);
         for (m = modules; m != NULL; m = m->next) {
+                char modname[MODULE_NAME_LEN];
                 const char *fname = bb_basename(m->name);
-                int fnlen = strchrnul(fname, '.') - fname;
+                filename2modname(fname, modname);
                 while (m->symbols) {
-                        printf("alias symbol:%s %.*s\n",
+                        printf("alias symbol:%s %s\n",
                                 (char*)llist_pop(&m->symbols),
-                                fnlen, fname);
+                                modname);
                 }
         }
 #endif
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 0ab942890..8e74b6438 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -62,7 +62,7 @@ static void modinfo(const char *path, const char *version,
                 "firmware",
         };
         size_t len;
-        int j, length;
+        int j;
         char *ptr, *the_module;
         const char *field = env->field;
         int tags = env->tags;
@@ -94,16 +94,18 @@ static void modinfo(const char *path, const char *version,
                 pattern = field;
                 if ((1<<j) & OPT_TAGS)
                         pattern = shortcuts[j];
-                length = strlen(pattern);
                 ptr = the_module;
                 while (1) {
+                        char *after_pattern;
+
                         ptr = memchr(ptr, *pattern, len - (ptr - (char*)the_module));
                         if (ptr == NULL) /* no occurance left, done */
                                 break;
-                        if (strncmp(ptr, pattern, length) == 0 && ptr[length] == '=') {
+                        after_pattern = is_prefixed_with(ptr, pattern);
+                        if (after_pattern && *after_pattern == '=') {
                                 /* field prefixes are 0x80 or 0x00 */
-                                if ((ptr[-1] & 0x7F) == '\0') {
-                                        ptr += length + 1;
+                                if ((ptr[-1] & 0x7F) == 0x00) {
+                                        ptr = after_pattern + 1;
                                         display(ptr, pattern, (1<<j) != tags);
                                         ptr += strlen(ptr);
                                 }
@@ -154,7 +156,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
                 if (colon == NULL)
                         continue;
                 *colon = '\0';
-                filename2modname(tokens[0], name);
+                filename2modname(bb_basename(tokens[0]), name);
                 for (i = 0; argv[i]; i++) {
                         if (fnmatch(argv[i], name, 0) == 0) {
                                 modinfo(tokens[0], uts.release, &env);
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index b7990bff1..9c941064b 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -116,21 +116,21 @@ static char* copy_stringbuf(void)
 
 static char* find_keyword(char *ptr, size_t len, const char *word)
 {
-        int wlen;
-
         if (!ptr) /* happens if xmalloc_open_zipped_read_close cannot read it */
                 return NULL;
 
-        wlen = strlen(word);
-        len -= wlen - 1;
+        len -= strlen(word) - 1;
         while ((ssize_t)len > 0) {
                 char *old = ptr;
+                char *after_word;
+
                 /* search for the first char in word */
-                ptr = memchr(ptr, *word, len);
+                ptr = memchr(ptr, word[0], len);
                 if (ptr == NULL) /* no occurance left, done */
                         break;
-                if (strncmp(ptr, word, wlen) == 0)
-                        return ptr + wlen; /* found, return ptr past it */
+                after_word = is_prefixed_with(ptr, word);
+                if (after_word)
+                        return after_word; /* found, return ptr past it */
                 ++ptr;
                 len -= (ptr - old);
         }
@@ -149,9 +149,13 @@ static void replace(char *s, char what, char with)
 static char *filename2modname(const char *filename, char *modname)
 {
         int i;
-        char *from;
+        const char *from;
 
-        from = bb_get_last_path_component_nostrip(filename);
+        // Disabled since otherwise "modprobe dir/name" would work
+        // as if it is "modprobe name". It is unclear why
+        // 'basenamization' was here in the first place.
+        //from = bb_get_last_path_component_nostrip(filename);
+        from = filename;
         for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
                 modname[i] = (from[i] == '-') ? '_' : from[i];
         modname[i] = '\0';
@@ -159,6 +163,15 @@ static char *filename2modname(const char *filename, char *modname)
         return modname;
 }
 
+static int pathname_matches_modname(const char *pathname, const char *modname)
+{
+        int r;
+        char name[MODULE_NAME_LEN];
+        filename2modname(bb_get_last_path_component_nostrip(pathname), name);
+        r = (strcmp(name, modname) == 0);
+        return r;
+}
+
 /* Take "word word", return malloced "word",NUL,"word",NUL,NUL */
 static char* str_2_list(const char *str)
 {
@@ -291,18 +304,6 @@ static void parse_module(module_info *info, const char *pathname)
         free(module_image);
 }
 
-static int pathname_matches_modname(const char *pathname, const char *modname)
-{
-        int r;
-        char name[MODULE_NAME_LEN];
-        const char *fname = bb_get_last_path_component_nostrip(pathname);
-        const char *suffix = strrstr(fname, ".ko");
-        safe_strncpy(name, fname, suffix - fname + 1);
-        replace(name, '-', '_');
-        r = (strcmp(name, modname) == 0);
-        return r;
-}
-
 static FAST_FUNC int fileAction(const char *pathname,
                 struct stat *sb UNUSED_PARAM,
                 void *modname_to_match,
@@ -535,22 +536,69 @@ static module_info** find_alias(const char *alias)
 // TODO: open only once, invent config_rewind()
 static int already_loaded(const char *name)
 {
-        int ret = 0;
-        char *s;
-        parser_t *parser = config_open2("/proc/modules", xfopen_for_read);
-        while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
-                if (strcmp(s, name) == 0) {
-                        ret = 1;
-                        break;
+        int ret;
+        char *line;
+        FILE *fp;
+
+        ret = 5 * 2;
+ again:
+        fp = fopen_for_read("/proc/modules");
+        if (!fp)
+                return 0;
+        while ((line = xmalloc_fgetline(fp)) != NULL) {
+                char *live;
+                char *after_name;
+
+                // Examples from kernel 3.14.6:
+                //pcspkr 12718 0 - Live 0xffffffffa017e000
+                //snd_timer 28690 2 snd_seq,snd_pcm, Live 0xffffffffa025e000
+                //i915 801405 2 - Live 0xffffffffa0096000
+                after_name = is_prefixed_with(line, name);
+                if (!after_name || *after_name != ' ') {
+                        free(line);
+                        continue;
                 }
+                live = strstr(line, " Live");
+                free(line);
+                if (!live) {
+                        /* State can be Unloading, Loading, or Live.
+                         * modprobe must not return prematurely if we see "Loading":
+                         * it can cause further programs to assume load completed,
+                         * but it did not (yet)!
+                         * Wait up to 5*20 ms for it to resolve.
+                         */
+                        ret -= 2;
+                        if (ret == 0)
+                                break;  /* huh? report as "not loaded" */
+                        fclose(fp);
+                        usleep(20*1000);
+                        goto again;
+                }
+                ret = 1;
+                break;
         }
-        config_close(parser);
-        return ret;
+        fclose(fp);
+
+        return ret & 1;
 }
 #else
-#define already_loaded(name) is_rmmod
+#define already_loaded(name) 0
 #endif
 
+static int rmmod(const char *filename)
+{
+        int r;
+        char modname[MODULE_NAME_LEN];
+
+        filename2modname(filename, modname);
+        r = delete_module(modname, O_NONBLOCK | O_EXCL);
+        dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
+        if (r != 0 && !(option_mask32 & OPT_q)) {
+                bb_perror_msg("remove '%s'", modname);
+        }
+        return r;
+}
+
 /*
  * Given modules definition and module name (or alias, or symbol)
  * load/remove the module respecting dependencies.
@@ -567,26 +615,36 @@ static void process_module(char *name, const char *cmdline_options)
         module_info **infovec;
         module_info *info;
         int infoidx;
-        int is_rmmod = (option_mask32 & OPT_r) != 0;
+        int is_remove = (option_mask32 & OPT_r) != 0;
 
         dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
 
         replace(name, '-', '_');
 
-        dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod);
+        dbg1_error_msg("already_loaded:%d is_remove:%d", already_loaded(name), is_remove);
+
+        if (applet_name[0] == 'r') {
+                /* rmmod.
+                 * Does not remove dependencies, no need to scan, just remove.
+                 * (compat note: this allows and strips .ko suffix)
+                 */
+                rmmod(name);
+                return;
+        }
+
         /*
-         * We used to have "is_rmmod != already_loaded(name)" check here, but
+         * We used to have "is_remove != already_loaded(name)" check here, but
          *  modprobe -r pci:v00008086d00007010sv00000000sd00000000bc01sc01i80
          * won't unload modules (there are more than one)
          * which have this alias.
          */
-        if (!is_rmmod && already_loaded(name)) {
+        if (!is_remove && already_loaded(name)) {
                 dbg1_error_msg("nothing to do for '%s'", name);
                 return;
         }
 
         options = NULL;
-        if (!is_rmmod) {
+        if (!is_remove) {
                 char *opt_filename = xasprintf("/etc/modules/%s", name);
                 options = xmalloc_open_read_close(opt_filename, NULL);
                 if (options)
@@ -620,7 +678,7 @@ static void process_module(char *name, const char *cmdline_options)
                         0 /* depth */
                 );
                 dbg1_error_msg("dirscan complete");
-                /* Module was not found, or load failed, or is_rmmod */
+                /* Module was not found, or load failed, or is_remove */
                 if (module_found_idx >= 0) { /* module was found */
                         infovec = xzalloc(2 * sizeof(infovec[0]));
                         infovec[0] = &modinfo[module_found_idx];
@@ -631,6 +689,14 @@ static void process_module(char *name, const char *cmdline_options)
                 infovec = find_alias(name);
         }
 
+        if (!infovec) {
+                /* both dirscan and find_alias found nothing */
+                if (!is_remove && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
+                        bb_error_msg("module '%s' not found", name);
+//TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
+                goto ret;
+        }
+
         /* There can be more than one module for the given alias. For example,
          * "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
          * ata_piix because it has alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
@@ -639,28 +705,15 @@ static void process_module(char *name, const char *cmdline_options)
          * a *list* of modinfo pointers from find_alias().
          */
 
-        /* rmmod or modprobe -r? unload module(s) */
-        if (is_rmmod) {
+        /* modprobe -r? unload module(s) */
+        if (is_remove) {
                 infoidx = 0;
                 while ((info = infovec[infoidx++]) != NULL) {
-                        int r;
-                        char modname[MODULE_NAME_LEN];
-
-                        filename2modname(info->pathname, modname);
-                        r = delete_module(modname, O_NONBLOCK | O_EXCL);
-                        dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
+                        int r = rmmod(bb_get_last_path_component_nostrip(info->pathname));
                         if (r != 0) {
-                                if (!(option_mask32 & OPT_q))
-                                        bb_perror_msg("remove '%s'", modname);
-                                goto ret;
+                                goto ret; /* error */
                         }
                 }
-
-                if (applet_name[0] == 'r') {
-                        /* rmmod: do not remove dependencies, exit */
-                        goto ret;
-                }
-
                 /* modprobe -r: we do not stop here -
                  * continue to unload modules on which the module depends:
                  * "-r --remove: option causes modprobe to remove a module.
@@ -669,14 +722,6 @@ static void process_module(char *name, const char *cmdline_options)
                  */
         }
 
-        if (!infovec) {
-                /* both dirscan and find_alias found nothing */
-                if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
-                        bb_error_msg("module '%s' not found", name);
-//TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
-                goto ret;
-        }
-
         infoidx = 0;
         while ((info = infovec[infoidx++]) != NULL) {
                 /* Iterate thru dependencies, trying to (un)load them */
@@ -689,7 +734,7 @@ static void process_module(char *name, const char *cmdline_options)
                 }
                 free(deps);
 
-                if (is_rmmod)
+                if (is_remove)
                         continue;
 
                 /* We are modprobe: load it */
@@ -892,10 +937,10 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         }
 
 #if ENABLE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
-        /* If not rmmod, parse possible module options given on command line.
+        /* If not rmmod/-r, parse possible module options given on command line.
          * insmod/modprobe takes one module name, the rest are parameters. */
         options = NULL;
-        if ('r' != applet0) {
+        if (!(option_mask32 & OPT_r)) {
                 char **arg = argv;
                 while (*++arg) {
                         /* Enclose options in quotes */
@@ -906,7 +951,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #else
-        if ('r' != applet0)
+        if (!(option_mask32 & OPT_r))
                 argv[1] = NULL;
 #endif
 
@@ -930,10 +975,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* Try to load modprobe.dep.bb */
-        load_dep_bb();
+        if ('r' != applet0) /* not rmmod */
+                load_dep_bb();
 
         /* Load/remove modules.
-         * Only rmmod loops here, modprobe has only argv[0] */
+         * Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */
         do {
                 process_module(*argv, options);
         } while (*++argv);
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index f0904285b..996de4074 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -15,8 +15,11 @@
 #include <sys/utsname.h>
 #include <fnmatch.h>
 
-//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#if 1
 #define DBG(...) ((void)0)
+#else
+#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#endif
 
 /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
  * we expect the full dependency list to be specified in modules.dep.
@@ -229,26 +232,20 @@ static ALWAYS_INLINE struct module_entry *get_or_add_modentry(const char *module
 {
         return helper_get_module(module, 1);
 }
-static ALWAYS_INLINE struct module_entry *get_modentry(const char *module)
+/* So far this function always gets a module pathname, never an alias name.
+ * The crucial difference is that pathname needs dirname stripping,
+ * while alias name must NOT do it!
+ * Testcase where dirname stripping is likely to go wrong: "modprobe devname:snd/timer"
+ */
+static ALWAYS_INLINE struct module_entry *get_modentry(const char *pathname)
 {
-        return helper_get_module(module, 0);
+        return helper_get_module(bb_get_last_path_component_nostrip(pathname), 0);
 }
 
 static void add_probe(const char *name)
 {
         struct module_entry *m;
 
-        /*
-         * get_or_add_modentry() strips path from name and works
-         * on remaining basename.
-         * This would make "rmmod dir/name" and "modprobe dir/name"
-         * to work like "rmmod name" and "modprobe name",
-         * which is wrong, and can be abused via implicit modprobing:
-         * "ifconfig /usbserial up" tries to modprobe netdev-/usbserial.
-         */
-        if (strchr(name, '/'))
-                bb_error_msg_and_die("malformed module name '%s'", name);
-
         m = get_or_add_modentry(name);
         if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
          && (m->flags & MODULE_FLAG_LOADED)
@@ -263,7 +260,7 @@ static void add_probe(const char *name)
         llist_add_to_end(&G.probes, m);
         G.num_unresolved_deps++;
         if (ENABLE_FEATURE_MODUTILS_SYMBOLS
-         && strncmp(m->modname, "symbol:", 7) == 0
+         && is_prefixed_with(m->modname, "symbol:")
         ) {
                 G.need_symbols = 1;
         }
@@ -356,22 +353,18 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo
         char *kcmdline_buf;
         char *kcmdline;
         char *kptr;
-        int len;
 
         kcmdline_buf = xmalloc_open_read_close("/proc/cmdline", NULL);
         if (!kcmdline_buf)
                 return options;
 
         kcmdline = kcmdline_buf;
-        len = strlen(modulename);
         while ((kptr = strsep(&kcmdline, "\n\t ")) != NULL) {
-                if (strncmp(modulename, kptr, len) != 0)
-                        continue;
-                kptr += len;
-                if (*kptr != '.')
+                char *after_modulename = is_prefixed_with(kptr, modulename);
+                if (!after_modulename || *after_modulename != '.')
                         continue;
                 /* It is "modulename.xxxx" */
-                kptr++;
+                kptr = after_modulename + 1;
                 if (strchr(kptr, '=') != NULL) {
                         /* It is "modulename.opt=[val]" */
                         options = gather_options_str(options, kptr);
@@ -428,7 +421,7 @@ static int do_modprobe(struct module_entry *m)
 
                 rc = 0;
                 fn = llist_pop(&m->deps); /* we leak it */
-                m2 = get_or_add_modentry(fn);
+                m2 = get_or_add_modentry(bb_get_last_path_component_nostrip(fn));
 
                 if (option_mask32 & OPT_REMOVE) {
                         /* modprobe -r */
@@ -510,7 +503,7 @@ static void load_modules_dep(void)
                 colon = last_char_is(tokens[0], ':');
                 if (colon == NULL)
                         continue;
-                *colon = 0;
+                *colon = '\0';
 
                 m = get_modentry(tokens[0]);
                 if (m == NULL)
@@ -557,7 +550,6 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 
         if (opt & OPT_LIST_ONLY) {
                 int i;
-                char name[MODULE_NAME_LEN];
                 char *colon, *tokens[2];
                 parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
 
@@ -569,10 +561,14 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         if (!colon)
                                 continue;
                         *colon = '\0';
-                        filename2modname(tokens[0], name);
                         if (!argv[0])
                                 puts(tokens[0]);
                         else {
+                                char name[MODULE_NAME_LEN];
+                                filename2modname(
+                                        bb_get_last_path_component_nostrip(tokens[0]),
+                                        name
+                                );
                                 for (i = 0; argv[i]; i++) {
                                         if (fnmatch(argv[i], name, 0) == 0) {
                                                 puts(tokens[0]);
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index 12cb75c54..fe46fc3fd 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -2255,7 +2255,7 @@ static int add_symbols_from(struct obj_file *f,
                  * symbols so they cannot fudge it by adding the prefix on
                  * their references.
                  */
-                if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
+                if (is_prefixed_with((char *)s->name, "GPLONLY_")) {
 #if ENABLE_FEATURE_CHECK_TAINTED_MODULE
                         if (gpl)
                                 s->name += 8;
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 6187ca72f..84300d931 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -47,18 +47,26 @@ int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim)
 
 char* FAST_FUNC filename2modname(const char *filename, char *modname)
 {
+        char local_modname[MODULE_NAME_LEN];
         int i;
-        char *from;
+        const char *from;
 
         if (filename == NULL)
                 return NULL;
         if (modname == NULL)
-                modname = xmalloc(MODULE_NAME_LEN);
-        from = bb_get_last_path_component_nostrip(filename);
+                modname = local_modname;
+        // Disabled since otherwise "modprobe dir/name" would work
+        // as if it is "modprobe name". It is unclear why
+        // 'basenamization' was here in the first place.
+        //from = bb_get_last_path_component_nostrip(filename);
+        from = filename;
         for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
                 modname[i] = (from[i] == '-') ? '_' : from[i];
         modname[i] = '\0';
 
+        if (modname == local_modname)
+                return xstrdup(modname);
+
         return modname;
 }