diff options
| author | Denys Vlasenko | 2015-01-01 19:02:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2015-01-01 19:02:40 +0100 |
| commit | 78854520ebecfd24d5c80a266d6779bd1e069016 (patch) | |
| tree | 43b2a405b44b07348a26312488513ad1aa171361 /modutils/modutils.c | |
| parent | 6c19d35f689c911b83073ab1faeffb8040c4b3d9 (diff) | |
| download | busybox-78854520ebecfd24d5c80a266d6779bd1e069016.zip busybox-78854520ebecfd24d5c80a266d6779bd1e069016.tar.gz | |
modprobe: revert checking for /, stop doing basename() on modprobe args
function old new delta
process_module 726 719 -7
filename2modname 81 67 -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-21) Total: -21 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/modutils.c')
| -rw-r--r-- | modutils/modutils.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modutils/modutils.c b/modutils/modutils.c index 6187ca7..ff79d3f 100644 --- a/modutils/modutils.c +++ b/modutils/modutils.c @@ -48,13 +48,17 @@ int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim) char* FAST_FUNC filename2modname(const char *filename, char *modname) { int i; - char *from; + const char *from; if (filename == NULL) return NULL; if (modname == NULL) modname = xmalloc(MODULE_NAME_LEN); - from = bb_get_last_path_component_nostrip(filename); + // Disabled since otherwise "modprobe dir/name" would work + // as if it is "modprobe name". It is unclear why + // 'basenamization' was here in the first place. + //from = bb_get_last_path_component_nostrip(filename); + from = filename; for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++) modname[i] = (from[i] == '-') ? '_' : from[i]; modname[i] = '\0'; |