Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 11 insertions, 3 deletions

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;
 }