aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-04-13 02:25:40 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-04-13 02:25:40 +0000
commit1f63229a8e5384bcc2ea99c9063383d3960fe275 (patch)
tree03fc1ff64127a30c9acc001c95f158583438a0b9
parent1fb26da0717312dbee703b5204876facd99262a9 (diff)
downloadbusybox-1f63229a8e5384bcc2ea99c9063383d3960fe275.tar.gz
busybox-1f63229a8e5384bcc2ea99c9063383d3960fe275.tar.bz2
rmmod: fix bug 263
"modutils/rmmod can't remove modules with dash in name on 2.4 kernels" function old new delta rmmod_main 187 220 +33
-rw-r--r--modutils/insmod.c2
-rw-r--r--modutils/modprobe-small.c2
-rw-r--r--modutils/modutils-24.c2
-rw-r--r--modutils/rmmod.c14
4 files changed, 13 insertions, 7 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 2c7f647e2..90ed87a72 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -35,7 +35,7 @@ int insmod_main(int argc UNUSED_PARAM, char **argv)
rc = bb_init_module(filename, parse_cmdline_module_options(argv));
if (rc)
- bb_error_msg("cannot insert '%s': %s", filename, moderror(rc));
+ bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
return rc;
}
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index d3fde0e8b..6eb950f32 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -776,7 +776,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
SKIP_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
) != 0)
- bb_error_msg_and_die("cannot insert '%s': %s",
+ bb_error_msg_and_die("can't insert '%s': %s",
*argv, moderror(errno));
return 0;
}
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index 4b0e78687..a16cb1bbe 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -3803,7 +3803,7 @@ int FAST_FUNC bb_init_module_24(const char *m_filename, const char *options)
if (m_has_modinfo) {
int m_version = new_get_module_version(f, m_strversion);
if (m_version == -1) {
- bb_error_msg_and_die("cannot find the kernel version "
+ bb_error_msg_and_die("can't find the kernel version "
"the module was compiled for");
}
}
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index cdc690a69..ee32dfdef 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -15,12 +15,11 @@ int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rmmod_main(int argc UNUSED_PARAM, char **argv)
{
int n;
- unsigned int flags = O_NONBLOCK|O_EXCL;
+ unsigned flags = O_NONBLOCK | O_EXCL;
/* Parse command line. */
n = getopt32(argv, "wfas"); // -s ignored
argv += optind;
-
if (n & 1) // --wait
flags &= ~O_NONBLOCK;
if (n & 2) // --force
@@ -35,11 +34,18 @@ int rmmod_main(int argc UNUSED_PARAM, char **argv)
if (!*argv)
bb_show_usage();
+ n = ENABLE_FEATURE_2_4_MODULES && get_linux_version_code() < KERNEL_VERSION(2,6,0);
while (*argv) {
char modname[MODULE_NAME_LEN];
- filename2modname(bb_basename(*argv++), modname);
+ const char *bname;
+
+ bname = bb_basename(*argv++);
+ if (n)
+ safe_strncpy(modname, bname, MODULE_NAME_LEN);
+ else
+ filename2modname(bname, modname);
if (bb_delete_module(modname, flags))
- bb_error_msg_and_die("cannot unload '%s': %s",
+ bb_error_msg_and_die("can't unload '%s': %s",
modname, moderror(errno));
}