chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fe07bd
)
conf-parser: use extract_first_word
author
David Reynolds
<david@alwaysmovefast.com>
Tue, 10 Nov 2015 07:45:26 +0000
(23:45 -0800)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 26 Apr 2017 10:58:55 +0000
(12:58 +0200)
src/shared/conf-parser.c
patch
|
blob
|
history
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 9416662125cdcdc6235f51407837629cfa764759..57b153a568c1f33ff1fa8aed82d20bb8e31acaad 100644
(file)
--- 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;
void *userdata) {
char ***sv = data;
- const char *word, *state;
- size_t l;
- int r;
assert(filename);
assert(lvalue);
assert(filename);
assert(lvalue);
@@
-725,25
+722,28
@@
int config_parse_strv(const char *unit,
return 0;
}
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();
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);
log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
- free(
n
);
+ free(
word
);
continue;
}
continue;
}
-
- r = strv_consume(sv, n);
+ r = strv_consume(sv, word);
if (r < 0)
return log_oom();
}
if (r < 0)
return log_oom();
}
- if (!isempty(state))
- log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring.");
return 0;
}
return 0;
}