From 726f15eba9606ee9f8b461a96fdd5ab86e86fcf7 Mon Sep 17 00:00:00 2001 From: schneider <schneider@blinkenlichts.net> Date: Fri, 3 Apr 2020 19:03:31 +0200 Subject: [PATCH] refact(config): Use iscntrl to trim lines in epic_config_get_string --- epicardium/modules/config.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epicardium/modules/config.c b/epicardium/modules/config.c index 8e39efd2c..0f2f2e740 100644 --- a/epicardium/modules/config.c +++ b/epicardium/modules/config.c @@ -323,10 +323,11 @@ int epic_config_get_string(const char *key, char *buf, size_t buf_len) return -ENOENT; } - char *eol = strchr(buf, '\n'); - if (eol) { - *eol = '\0'; - } + char *end = buf; + while (!iscntrl(*end)) + end++; + *end = 0; + trim(buf); return 0; } -- GitLab