picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journald-server: port to extract_first_word

Browse source
This commit is contained in:
Susant Sahani 2015-10-26 15:28:03 +05:30
parent 931c7feac0
commit d581d9d91f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/journal/journald-server.c
View file

@ -1287,8 +1287,7 @@ static int setup_signals(Server *s) {
static int server_parse_proc_cmdline(Server *s) {
_cleanup_free_ char *line = NULL;
const char *w, *state;
size_t l;
const char *p;
int r;
r = proc_cmdline(&line);
@ -1297,12 +1296,16 @@ static int server_parse_proc_cmdline(Server *s) {
return 0;
}
FOREACH_WORD_QUOTED(w, l, line, state) {
p = line;
for(;;) {
_cleanup_free_ char *word;
word = strndup(w, l);
if (!word)
return -ENOMEM;
r = extract_first_word(&p, &word, NULL, 0);
if (r < 0)
return log_error_errno(r, "Failed to parse journald syntax \"%s\": %m", line);
if (r == 0)
break;
if (startswith(word, "systemd.journald.forward_to_syslog=")) {
r = parse_boolean(word + 35);