From f4fc303e3679e4ab0d45f60c31f9b687f27f7452 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 27 Nov 2018 11:26:48 +0100 Subject: 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 --- modutils/modprobe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modutils') 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, parser_t *p; struct module_entry *m; int rc = TRUE; - const char *base, *ext; + const char *base; /* Skip files that begin with a "." */ base = bb_basename(filename); @@ -266,8 +266,7 @@ static int FAST_FUNC config_file_action(const char *filename, * "include FILE_NOT_ENDING_IN_CONF" must work too. */ if (depth != 0) { - ext = strrchr(base, '.'); - if (ext == NULL || strcmp(ext + 1, "conf")) + if (!is_suffixed_with(base, ".conf")) goto error; } -- cgit v1.2.3