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

core: parse socket port to extract_first_word

Browse Source
This commit is contained in:
Susant Sahani
2015-11-03 22:49:05 +05:30
parent 5dea1c1e79
commit 7b2313f5ca
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/load-fragment.c
+13 -9
View File
@@ -1582,8 +1582,7 @@ int config_parse_service_sockets(
void *userdata) { void *userdata) {
Service *s = data; Service *s = data;
const char *word, *state; const char *p;
size_t l;
int r; int r;
assert(filename); assert(filename);
@@ -1591,14 +1590,21 @@ int config_parse_service_sockets(
assert(rvalue); assert(rvalue);
assert(data); assert(data);
FOREACH_WORD_QUOTED(word, l, rvalue, state) { p = rvalue;
_cleanup_free_ char *t = NULL, *k = NULL; for(;;) {
_cleanup_free_ char *word = NULL, *t = NULL, *k = NULL;
t = strndup(word, l); r = extract_first_word(&p, &word, NULL, 0);
if (!t) if (r == 0)
break;
if (r == -ENOMEM)
return log_oom(); return log_oom();
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Trailing garbage in sockets, ignoring: %s", rvalue);
break;
}
r = unit_name_printf(UNIT(s), t, &k); r = unit_name_printf(UNIT(s), word, &k);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m"); log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");
continue; continue;
@@ -1617,8 +1623,6 @@ int config_parse_service_sockets(
if (r < 0) if (r < 0)
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to add dependency on %s, ignoring: %m", k); log_syntax(unit, LOG_ERR, filename, line, r, "Failed to add dependency on %s, ignoring: %m", k);
} }
if (!isempty(state))
log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring.");
return 0; return 0;
} }