shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-27 14:03:43 +03:00
Code

resolved-dns-trust-anchor: FOREACH_LINE excorcism

Browse Source 
Also, properly ignore these read errors, and say so.
This commit is contained in:
Lennart Poettering 2018-10-18 16:16:06 +02:00
parent 271c8ec50f
commit 0a6488b441
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/resolve/resolved-dns-trust-anchor.c
View File

@ -433,7 +433,6 @@ static int dns_trust_anchor_load_files(
STRV_FOREACH(f, files) {
_cleanup_fclose_ FILE *g = NULL;
char line[LINE_MAX];
unsigned n = 0;
g = fopen(*f, "r");
@ -441,13 +440,22 @@ static int dns_trust_anchor_load_files(
if (errno == ENOENT)
continue;
log_warning_errno(errno, "Failed to open %s: %m", *f);
log_warning_errno(errno, "Failed to open '%s', ignoring: %m", *f);
continue;
}
FOREACH_LINE(line, g, log_warning_errno(errno, "Failed to read %s, ignoring: %m", *f)) {
for (;;) {
_cleanup_free_ char *line = NULL;
char *l;
r = read_line(g, LONG_LINE_MAX, &line);
if (r < 0) {
log_warning_errno(r, "Failed to read '%s', ignoring: %m", *f);
break;
}
if (r == 0)
break;
n++;
l = strstrip(line);