emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Cristian Ionescu-Idbohrn to deal with _ vs - better.

Browse Source
This commit is contained in:
Rob Landley 2005-11-27 19:01:53 +00:00
parent 350865e339
commit 52219874fe
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modutils/rmmod.c
View File

@ -27,6 +27,7 @@
#include <getopt.h> #include <getopt.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <sys/utsname.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "busybox.h" #include "busybox.h"
@ -44,7 +45,16 @@ static inline void filename2modname(char *modname, const char *filename)
/* Convert to underscores, stop at first . */ /* Convert to underscores, stop at first . */
for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) { for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
if (afterslash[i] == '-') int kr_chk = 1;
if (ENABLE_FEATURE_2_4_MODULES) {
struct utsname uname_info;
if (uname(&uname_info) == -1)
bb_error_msg_and_die("cannot get uname data");
if (strcmp(uname_info.release, "2.6") < 0)
kr_chk = 0;
}
if (kr_chk && (afterslash[i] == '-'))
modname[i] = '_'; modname[i] = '_';
else else
modname[i] = afterslash[i]; modname[i] = afterslash[i];