summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reynolds <david@alwaysmovefast.com>2015-11-09 23:45:26 -0800
committerSven Eden <yamakuzure@gmx.net>2017-04-26 12:58:55 +0200
commit03cd001a7cf47d69ecdac32a8d6454ab04ccd458 (patch)
treeec2339a85ec2eec9b1b43f3249702004f3e3db86
parent6fe07bd8f8802afd7cfe020dca0f26300227bc54 (diff)
conf-parser: use extract_first_word
-rw-r--r--src/shared/conf-parser.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 941666212..57b153a56 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -700,9 +700,6 @@ int config_parse_strv(const char *unit,
void *userdata) {
char ***sv = data;
- const char *word, *state;
- size_t l;
- int r;
assert(filename);
assert(lvalue);
@@ -725,25 +722,28 @@ int config_parse_strv(const char *unit,
return 0;
}
- FOREACH_WORD_QUOTED(word, l, rvalue, state) {
- char *n;
-
- n = strndup(word, l);
- if (!n)
+ for (;;) {
+ char *word = NULL;
+ int r;
+ r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES);
+ if (r == 0)
+ break;
+ if (r == -ENOMEM)
return log_oom();
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
+ break;
+ }
- if (!utf8_is_valid(n)) {
+ if (!utf8_is_valid(word)) {
log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
- free(n);
+ free(word);
continue;
}
-
- r = strv_consume(sv, n);
+ r = strv_consume(sv, word);
if (r < 0)
return log_oom();
}
- if (!isempty(state))
- log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring.");
return 0;
}