svn commit: [26081] trunk/busybox/modutils
vda at busybox.net
vda at busybox.net
Mon Apr 13 02:25:40 UTC 2009
Author: vda
Date: 2009-04-13 02:25:40 +0000 (Mon, 13 Apr 2009)
New Revision: 26081
Log:
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
Modified:
trunk/busybox/modutils/insmod.c
trunk/busybox/modutils/modprobe-small.c
trunk/busybox/modutils/modutils-24.c
trunk/busybox/modutils/rmmod.c
Changeset:
Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c 2009-04-13 02:15:57 UTC (rev 26080)
+++ trunk/busybox/modutils/insmod.c 2009-04-13 02:25:40 UTC (rev 26081)
@@ -35,7 +35,7 @@
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;
}
Modified: trunk/busybox/modutils/modprobe-small.c
===================================================================
--- trunk/busybox/modutils/modprobe-small.c 2009-04-13 02:15:57 UTC (rev 26080)
+++ trunk/busybox/modutils/modprobe-small.c 2009-04-13 02:25:40 UTC (rev 26081)
@@ -776,7 +776,7 @@
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;
}
Modified: trunk/busybox/modutils/modutils-24.c
===================================================================
--- trunk/busybox/modutils/modutils-24.c 2009-04-13 02:15:57 UTC (rev 26080)
+++ trunk/busybox/modutils/modutils-24.c 2009-04-13 02:25:40 UTC (rev 26081)
@@ -3803,7 +3803,7 @@
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");
}
}
Modified: trunk/busybox/modutils/rmmod.c
===================================================================
--- trunk/busybox/modutils/rmmod.c 2009-04-13 02:15:57 UTC (rev 26080)
+++ trunk/busybox/modutils/rmmod.c 2009-04-13 02:25:40 UTC (rev 26081)
@@ -15,12 +15,11 @@
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 @@
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));
}
More information about the busybox-cvs
mailing list