diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/Config.in | 8 | ||||
| -rw-r--r-- | modutils/depmod.c | 2 | ||||
| -rw-r--r-- | modutils/modprobe.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/modutils/Config.in b/modutils/Config.in index c0dff1a..2b0bcdd 100644 --- a/modutils/Config.in +++ b/modutils/Config.in @@ -153,10 +153,10 @@ config FEATURE_MODPROBE_BLACKLIST default n depends on MODPROBE && FEATURE_2_6_MODULES help - Say 'y' here to enable support for the 'blacklist' command in - modprobe.conf. This prevents the alias resolver to resolve - blacklisted modules. This is useful if you want to prevent your - hardware autodetection scripts to load modules like evdev, frame + Say 'y' here to enable support for the 'blacklist' command in + modprobe.conf. This prevents the alias resolver to resolve + blacklisted modules. This is useful if you want to prevent your + hardware autodetection scripts to load modules like evdev, frame buffer drivers etc. comment "Options common to multiple modutils" diff --git a/modutils/depmod.c b/modutils/depmod.c index 733cd95..4998d64 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -181,7 +181,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv) char *shortname = llist_pop(&old_deps); while (all) { - char *nam = + char *nam = xstrdup(bb_get_last_path_component_nostrip(all->name)); char *tmp = strrstr(nam, ".ko"); diff --git a/modutils/modprobe.c b/modutils/modprobe.c index db946bb..84a2d76 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -232,10 +232,10 @@ static char *parse_command_string(char *src, char **dst) #endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ static int is_conf_command(char *buffer, const char *command) -{ +{ int len = strlen(command); return ((strstr(buffer, command) == buffer) && - isspace(buffer[len])); + isspace(buffer[len])); } /* @@ -325,7 +325,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf include_conf(first, current, buffer, buflen, fdi); close(fdi); } - } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && + } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && (is_conf_command(buffer, "blacklist"))) { char *mod; struct dep_t *dt; |