aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/Config.in8
-rw-r--r--modutils/depmod.c2
-rw-r--r--modutils/modprobe.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/modutils/Config.in b/modutils/Config.in
index c0dff1a4c..2b0bcdd6e 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -153,10 +153,10 @@ config FEATURE_MODPROBE_BLACKLIST
153 default n 153 default n
154 depends on MODPROBE && FEATURE_2_6_MODULES 154 depends on MODPROBE && FEATURE_2_6_MODULES
155 help 155 help
156 Say 'y' here to enable support for the 'blacklist' command in 156 Say 'y' here to enable support for the 'blacklist' command in
157 modprobe.conf. This prevents the alias resolver to resolve 157 modprobe.conf. This prevents the alias resolver to resolve
158 blacklisted modules. This is useful if you want to prevent your 158 blacklisted modules. This is useful if you want to prevent your
159 hardware autodetection scripts to load modules like evdev, frame 159 hardware autodetection scripts to load modules like evdev, frame
160 buffer drivers etc. 160 buffer drivers etc.
161 161
162comment "Options common to multiple modutils" 162comment "Options common to multiple modutils"
diff --git a/modutils/depmod.c b/modutils/depmod.c
index 733cd95bf..4998d641d 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -181,7 +181,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
181 char *shortname = llist_pop(&old_deps); 181 char *shortname = llist_pop(&old_deps);
182 182
183 while (all) { 183 while (all) {
184 char *nam = 184 char *nam =
185 xstrdup(bb_get_last_path_component_nostrip(all->name)); 185 xstrdup(bb_get_last_path_component_nostrip(all->name));
186 char *tmp = strrstr(nam, ".ko"); 186 char *tmp = strrstr(nam, ".ko");
187 187
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index db946bb2e..84a2d7686 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -232,10 +232,10 @@ static char *parse_command_string(char *src, char **dst)
232#endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ 232#endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
233 233
234static int is_conf_command(char *buffer, const char *command) 234static int is_conf_command(char *buffer, const char *command)
235{ 235{
236 int len = strlen(command); 236 int len = strlen(command);
237 return ((strstr(buffer, command) == buffer) && 237 return ((strstr(buffer, command) == buffer) &&
238 isspace(buffer[len])); 238 isspace(buffer[len]));
239} 239}
240 240
241/* 241/*
@@ -325,7 +325,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
325 include_conf(first, current, buffer, buflen, fdi); 325 include_conf(first, current, buffer, buflen, fdi);
326 close(fdi); 326 close(fdi);
327 } 327 }
328 } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && 328 } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
329 (is_conf_command(buffer, "blacklist"))) { 329 (is_conf_command(buffer, "blacklist"))) {
330 char *mod; 330 char *mod;
331 struct dep_t *dt; 331 struct dep_t *dt;