diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
| commit | 373275a708bafb88fa4f0519de2166154f44fed9 (patch) | |
| tree | 4587b4fd3f695e0f3705b2a217e199f3144df931 /modutils/modutils.c | |
| parent | b74b2619779b1deb903b7766261807df1e9b1f7f (diff) | |
| parent | c2b18583a3df06aeecf535c3cea6856aa1f2e205 (diff) | |
| download | busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.gz busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.bz2 busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.zip | |
Merge branch 'busybox' into merge
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) |