diff options
author | Kang-Che Sung <explorer09@gmail.com> | 2017-01-31 21:09:17 +0800 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-01 10:14:05 +0100 |
commit | b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556 (patch) | |
tree | afc10aba770e711341483ef13b95ab3ac4916f9b /modutils/modutils.c | |
parent | 264cb01540cdd995e7c376fd8bcef94e09e31819 (diff) | |
download | busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.tar.gz busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.tar.bz2 busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.zip |
cmdline module options can be disabled on "big" modutils
Allow module options on command line to be disabled on "big" modutils.
Config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is renamed to
FEATURE_CMDLINE_MODULE_OPTIONS and no longer depends on !MODPROBE_SMALL
(I'm not sure if disabling this is useful on "big" modutils, but at
least the macro can serve as a marker and ensure both implementations
of same feature have consistent behavior.)
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/modutils.c')
-rw-r--r-- | modutils/modutils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modutils/modutils.c b/modutils/modutils.c index 4204f06fe..dae623ee4 100644 --- a/modutils/modutils.c +++ b/modutils/modutils.c | |||
@@ -120,6 +120,7 @@ char* FAST_FUNC filename2modname(const char *filename, char *modname) | |||
120 | return modname; | 120 | return modname; |
121 | } | 121 | } |
122 | 122 | ||
123 | #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS | ||
123 | char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) | 124 | char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) |
124 | { | 125 | { |
125 | char *options; | 126 | char *options; |
@@ -155,6 +156,7 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) | |||
155 | /* if (optlen != 0) options[optlen-1] = '\0'; */ | 156 | /* if (optlen != 0) options[optlen-1] = '\0'; */ |
156 | return options; | 157 | return options; |
157 | } | 158 | } |
159 | #endif | ||
158 | 160 | ||
159 | #if ENABLE_FEATURE_INSMOD_TRY_MMAP | 161 | #if ENABLE_FEATURE_INSMOD_TRY_MMAP |
160 | void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p) | 162 | void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p) |