aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-11-27 11:26:48 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-11-27 11:26:48 +0100
commitf4fc303e3679e4ab0d45f60c31f9b687f27f7452 (patch)
treec270be417b97696e3a9897eab5602ce30faf313d /modutils
parent2d217799e8f23514ad3be6a951aa928c265bc6a4 (diff)
downloadbusybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.tar.gz
busybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.tar.bz2
busybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.zip
tar: fix too eager autodetection, closes 11531
function old new delta is_suffixed_with - 54 +54 tar_main 1006 1026 +20 open_transformer 92 79 -13 config_file_action 478 458 -20 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/2 up/down: 74/-33) Total: 41 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils')
-rw-r--r--modutils/modprobe.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 59f6d54f3..291e4cb90 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -245,7 +245,7 @@ static int FAST_FUNC config_file_action(const char *filename,
245 parser_t *p; 245 parser_t *p;
246 struct module_entry *m; 246 struct module_entry *m;
247 int rc = TRUE; 247 int rc = TRUE;
248 const char *base, *ext; 248 const char *base;
249 249
250 /* Skip files that begin with a "." */ 250 /* Skip files that begin with a "." */
251 base = bb_basename(filename); 251 base = bb_basename(filename);
@@ -266,8 +266,7 @@ static int FAST_FUNC config_file_action(const char *filename,
266 * "include FILE_NOT_ENDING_IN_CONF" must work too. 266 * "include FILE_NOT_ENDING_IN_CONF" must work too.
267 */ 267 */
268 if (depth != 0) { 268 if (depth != 0) {
269 ext = strrchr(base, '.'); 269 if (!is_suffixed_with(base, ".conf"))
270 if (ext == NULL || strcmp(ext + 1, "conf"))
271 goto error; 270 goto error;
272 } 271 }
273 272