65c8c7ba2
Glenn L McGrath
2004-08-11
Subject
Willian Barsse wrote "There seems to be a slight problem with the "mod_strcmp" function in modprobe.c, it scans for the first occurence of the module name in the "mod_path" variable and expects it to be the last path element. ie /lib/modules/2.4.22-debug/kernel/fs/vfat in my example. The comparison
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/modprobe.c+7 -8
| @@ -361,21 +361,20 @@ static struct dep_t *build_dep ( void ) | |
| /* return 1 = found, 0 = not found */ | |
| static int mod_strcmp ( const char *mod_path, const char *mod_name ) | |
| { | |
| - | #if defined(CONFIG_FEATURE_2_6_MODULES) |
| - | #define MODULE_EXTENSION ".ko" |
| - | #define MOD_EXTENSION_LEN 3 |
| - | #else |
| - | #define MODULE_EXTENSION ".o" |
| - | #define MOD_EXTENSION_LEN 2 |
| - | #endif |
| /* last path component */ | |
| const char *last_comp = strrchr (mod_path, '/'); | |
| + | const char *mod_ext = ".o"; |
| + | |
| + | #if defined(CONFIG_FEATURE_2_6_MODULES) |
| + | if ( k_version > 4 ) |
| + | mod_ext = ".ko"; |
| + | #endif |
| return (strncmp(last_comp ? last_comp + 1 : mod_path, | |
| mod_name, | |
| strlen(mod_name)) == 0 ) && | |
| (strcmp(mod_path + strlen(mod_path) - | |
| - | MOD_EXTENSION_LEN, MODULE_EXTENSION) == 0); |
| + | strlen(mod_ext), mod_ext) == 0); |
| } | |
| /* return 1 = loaded, 0 = not loaded, -1 = can't tell */ | |