diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-01-04 07:30:40 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-01-04 07:30:40 +0000 |
| commit | 07f000fa453dc455a343c8ba28418707b04326dc (patch) | |
| tree | 498889333d3f16951214cba73c5e9d565efee3f1 /config.c | |
| parent | Merge branch 'macros' (diff) | |
| parent | Add myself to Contributors (diff) | |
Merge branch 'blank-before-trailing-comment'
Closes #270
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -1731,9 +1731,18 @@ parse_config_file(FILE *f, struct config *conf, const char *path, bool errors_ar if (line[0] == '\0' || line[0] == '#') continue; - /* Split up into key/value pair + trailing comment */ - char *key_value = strtok(line, "#"); - char UNUSED *comment = strtok(NULL, "\n"); + /* Split up into key/value pair + trailing comment separated by blank */ + char *key_value = line; + char *comment = line; + while (comment[0] != '\0') { + const char c = comment[0]; + comment++; + if (isblank(c) && comment[0] == '#') { + comment[0] = '\0'; /* Terminate key/value pair */ + comment++; + break; + } + } /* Check for new section */ if (key_value[0] == '[') { |
