picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared/conf-parser: turn CONFIG_PARSE_REFUSE_BOM flag into a local variable 

This is an internal implementation detail.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-11-22 10:53:26 +01:00
parent bdf2357c12
commit f9761a89a8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/conf-parser.c
View File

@ -282,7 +282,7 @@ int config_parse(const char *unit,
_cleanup_free_ char *section = NULL, *continuation = NULL;
_cleanup_fclose_ FILE *ours = NULL;
unsigned line = 0, section_line = 0;
bool section_ignored = false;
bool section_ignored = false, bom_seen = false;
int r;
assert(filename);
@ -328,13 +328,13 @@ int config_parse(const char *unit,
continue;
l = buf;
if (!(flags & CONFIG_PARSE_REFUSE_BOM)) {
if (!bom_seen) {
char *q;
q = startswith(buf, UTF8_BYTE_ORDER_MARK);
if (q) {
l = q;
flags |= CONFIG_PARSE_REFUSE_BOM;
bom_seen = true;
}
}

1
src/shared/conf-parser.h
View File

@ -17,7 +17,6 @@ typedef enum ConfigParseFlags {
CONFIG_PARSE_RELAXED = 1 << 0,
CONFIG_PARSE_ALLOW_INCLUDE = 1 << 1,
CONFIG_PARSE_WARN = 1 << 2,
CONFIG_PARSE_REFUSE_BOM = 1 << 3,
} ConfigParseFlags;
/* Argument list for parsers of specific configuration settings. */