SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conf-parser: use extract_first_word

Browse Source
This commit is contained in:
David Reynolds
2015-11-09 23:57:49 -08:00
parent b18fc75b07
commit 34f253f087
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/conf-parser.c
+16 -16
View File
@@ -702,9 +702,6 @@ int config_parse_strv(const char *unit,
void *userdata) { void *userdata) {
char ***sv = data; char ***sv = data;
const char *word, *state;
size_t l;
int r;
assert(filename); assert(filename);
assert(lvalue); assert(lvalue);
@@ -727,25 +724,28 @@ int config_parse_strv(const char *unit,
return 0; return 0;
} }
FOREACH_WORD_QUOTED(word, l, rvalue, state) { for (;;) {
char *n; char *word = NULL;
int r;
n = strndup(word, l); r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES);
if (!n) if (r == 0)
break;
if (r == -ENOMEM)
return log_oom(); return log_oom();
if (r < 0) {
if (!utf8_is_valid(n)) { log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue); break;
free(n);
continue;
} }
r = strv_consume(sv, n); if (!utf8_is_valid(word)) {
log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
free(word);
continue;
}
r = strv_consume(sv, word);
if (r < 0) if (r < 0)
return log_oom(); return log_oom();
} }
if (!isempty(state))
log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring.");
return 0; return 0;
} }