aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modutils/modprobe-small.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index cf8a3f0fe..cafbdc0b2 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -163,6 +163,15 @@ static char *filename2modname(const char *filename, char *modname)
163 return modname; 163 return modname;
164} 164}
165 165
166static int pathname_matches_modname(const char *pathname, const char *modname)
167{
168 int r;
169 char name[MODULE_NAME_LEN];
170 filename2modname(bb_get_last_path_component_nostrip(pathname), name);
171 r = (strcmp(name, modname) == 0);
172 return r;
173}
174
166/* Take "word word", return malloced "word",NUL,"word",NUL,NUL */ 175/* Take "word word", return malloced "word",NUL,"word",NUL,NUL */
167static char* str_2_list(const char *str) 176static char* str_2_list(const char *str)
168{ 177{
@@ -295,18 +304,6 @@ static void parse_module(module_info *info, const char *pathname)
295 free(module_image); 304 free(module_image);
296} 305}
297 306
298static int pathname_matches_modname(const char *pathname, const char *modname)
299{
300 int r;
301 char name[MODULE_NAME_LEN];
302 const char *fname = bb_get_last_path_component_nostrip(pathname);
303 const char *suffix = strrstr(fname, ".ko");
304 safe_strncpy(name, fname, suffix - fname + 1);
305 replace(name, '-', '_');
306 r = (strcmp(name, modname) == 0);
307 return r;
308}
309
310static FAST_FUNC int fileAction(const char *pathname, 307static FAST_FUNC int fileAction(const char *pathname,
311 struct stat *sb UNUSED_PARAM, 308 struct stat *sb UNUSED_PARAM,
312 void *modname_to_match, 309 void *modname_to_match,