aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-22 18:29:01 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-22 18:29:01 +0000
commit36309cf3f495dcfd4aba541425b34dd2455cccf2 (patch)
tree5ab06fac3af13f714ac6f69dfacf88246499ce10 /modutils
parentcc5feabeba2b1cbc3a1751af08f645b868967519 (diff)
downloadbusybox-36309cf3f495dcfd4aba541425b34dd2455cccf2.tar.gz
busybox-36309cf3f495dcfd4aba541425b34dd2455cccf2.tar.bz2
insmod: clarify module_name / file_name distinction
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c10
-rw-r--r--modutils/modutils-24.c16
-rw-r--r--modutils/modutils.h2
3 files changed, 18 insertions, 10 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 61ee5009b..4d211f50c 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -16,9 +16,17 @@ int insmod_main(int argc UNUSED_PARAM, char **argv)
char *filename;
int rc;
+ /* Compat note:
+ * 2.6 style insmod has no options and required filename
+ * (not module name - .ko can't be omitted).
+ * 2.4 style insmod can take module name without .ko
+ * and performs module search in default directories
+ * or in $MODPATH.
+ */
+
USE_FEATURE_2_4_MODULES(
getopt32(argv, INSMOD_OPTS INSMOD_ARGS);
- argv += optind-1;
+ argv += optind - 1;
);
filename = *++argv;
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index ae0afd44c..ecab193ce 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -3810,7 +3810,7 @@ static void print_load_map(struct obj_file *f UNUSED_PARAM)
}
#endif
-int FAST_FUNC bb_init_module_24(const char *m_filename, const char *options UNUSED_PARAM)
+int FAST_FUNC bb_init_module_24(const char *m_filename, const char *options)
{
int k_crcs;
unsigned long m_size;
@@ -3906,13 +3906,13 @@ int FAST_FUNC bb_init_module_24(const char *m_filename, const char *options UNUS
m_addr = create_module(m_name, m_size);
if (m_addr == (ElfW(Addr))(-1)) switch (errno) {
- case EEXIST:
- bb_error_msg_and_die("a module named %s already exists", m_name);
- case ENOMEM:
- bb_error_msg_and_die("can't allocate kernel memory for module; needed %lu bytes",
- m_size);
- default:
- bb_perror_msg_and_die("create_module: %s", m_name);
+ case EEXIST:
+ bb_error_msg_and_die("a module named %s already exists", m_name);
+ case ENOMEM:
+ bb_error_msg_and_die("can't allocate kernel memory for module; needed %lu bytes",
+ m_size);
+ default:
+ bb_perror_msg_and_die("create_module: %s", m_name);
}
#if !LOADBITS
diff --git a/modutils/modutils.h b/modutils/modutils.h
index 32ee18b06..ddd4e1790 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -23,7 +23,7 @@ const char *moderror(int err) FAST_FUNC;
llist_t *llist_find(llist_t *first, const char *str) FAST_FUNC;
void replace(char *s, char what, char with) FAST_FUNC;
char *replace_underscores(char *s) FAST_FUNC;
-int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC ;
+int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
char *filename2modname(const char *filename, char *modname) FAST_FUNC;
char *parse_cmdline_module_options(char **argv) FAST_FUNC;