aboutsummaryrefslogtreecommitdiff
path: root/modutils/modutils.c
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/modutils.c')
-rw-r--r--modutils/modutils.c14
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)
47 47
48char* FAST_FUNC filename2modname(const char *filename, char *modname) 48char* FAST_FUNC filename2modname(const char *filename, char *modname)
49{ 49{
50 char local_modname[MODULE_NAME_LEN];
50 int i; 51 int i;
51 char *from; 52 const char *from;
52 53
53 if (filename == NULL) 54 if (filename == NULL)
54 return NULL; 55 return NULL;
55 if (modname == NULL) 56 if (modname == NULL)
56 modname = xmalloc(MODULE_NAME_LEN); 57 modname = local_modname;
57 from = bb_get_last_path_component_nostrip(filename); 58 // Disabled since otherwise "modprobe dir/name" would work
59 // as if it is "modprobe name". It is unclear why
60 // 'basenamization' was here in the first place.
61 //from = bb_get_last_path_component_nostrip(filename);
62 from = filename;
58 for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++) 63 for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
59 modname[i] = (from[i] == '-') ? '_' : from[i]; 64 modname[i] = (from[i] == '-') ? '_' : from[i];
60 modname[i] = '\0'; 65 modname[i] = '\0';
61 66
67 if (modname == local_modname)
68 return xstrdup(modname);
69
62 return modname; 70 return modname;
63} 71}
64 72