shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

modules-load: fgets() excorcism

Browse Source
This commit is contained in:
Lennart Poettering 2018-10-18 13:40:21 +02:00
parent 1d47b56995
commit a889e206a7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules-load/modules-load.c
View File

@ -72,25 +72,25 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
if (ignore_enoent && r == -ENOENT)
return 0;
return log_error_errno(r, "Failed to open %s, ignoring: %m", path);
return log_error_errno(r, "Failed to open %s: %m", path);
}
log_debug("apply: %s", path);
for (;;) {
char line[LINE_MAX], *l;
_cleanup_free_ char *line = NULL;
char *l;
int k;
if (!fgets(line, sizeof(line), f)) {
if (feof(f))
break;
return log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path);
}
r = read_line(f, LONG_LINE_MAX, &line);
if (r < 0)
return log_error_errno(errno, "Failed to read file '%s': %m", path);
if (r == 0)
break;
l = strstrip(line);
if (!*l)
if (isempty(l))
continue;
if (strchr(COMMENTS "\n", *l))
if (strchr(COMMENTS, *l))
continue;
k = module_load_and_warn(ctx, l, true);