core: Use extract_first_word in config_parse_join_controllers

Related to the TODO item to replace FOREACH_WORD_QUOTED with it.

Tested by setting `JoinControllers=cpu,cpuacct,memory net_cls,blkio' in
/etc/systemd/system.conf, rebooting the system with the patched binaries
and checking that the desired setup was created by inspecting the
entries under /sys/fs/cgroup.

No regressions observed in test cases.
This commit is contained in:
Filipe Brandenburger
2015-08-31 17:33:35 -07:00
parent d4c8dcc47a
commit d4ebeb4fb3
+11 -11
View File
@@ -539,8 +539,6 @@ static int config_parse_join_controllers(const char *unit,
void *userdata) {
unsigned n = 0;
const char *word, *state;
size_t length;
assert(filename);
assert(lvalue);
@@ -548,16 +546,18 @@ static int config_parse_join_controllers(const char *unit,
free_join_controllers();
FOREACH_WORD_QUOTED(word, length, rvalue, state) {
char *s, **l;
for (;;) {
_cleanup_free_ char *word = NULL;
char **l;
int r;
s = strndup(word, length);
if (!s)
return log_oom();
l = strv_split(s, ",");
free(s);
r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES);
if (r < 0)
return r;
if (r == 0)
break;
l = strv_split(word, ",");
strv_uniq(l);
if (strv_length(l) <= 1) {
@@ -617,7 +617,7 @@ static int config_parse_join_controllers(const char *unit,
arg_join_controllers = t;
}
}
if (!isempty(state))
if (!isempty(rvalue))
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Trailing garbage, ignoring.");