From 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 17 Dec 2016 08:18:32 -0500 Subject: ini: only recognize comments at beginning of line Allows the hash sign to be used in values in config files and hooks. Fixes #48702 Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/common/ini.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/common') diff --git a/src/common/ini.c b/src/common/ini.c index c0979437..e6437de3 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -61,19 +61,14 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value, *ptr; + char *key, *value; size_t line_len; linenum++; - /* ignore whole line and end of line comments */ - if((ptr = strchr(line, '#'))) { - *ptr = '\0'; - } - line_len = strtrim(line); - if(line_len == 0) { + if(line_len == 0 || line[0] == '#') { continue; } -- cgit v1.2.3-70-g09d2