From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Oct 2018 14:18:52 +0000 (+0200)
Subject: sysusers: FOREACH_LINE excorcism
X-Git-Tag: v240~513^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=050ca2996388d681d12b4be78511764b1839a92f;p=thirdparty%2Fsystemd.git

sysusers: FOREACH_LINE excorcism
---

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 91722408da3..0c9902adf65 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1681,7 +1681,6 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
 static int read_config_file(const char *fn, bool ignore_enoent) {
         _cleanup_fclose_ FILE *rf = NULL;
         FILE *f = NULL;
-        char line[LINE_MAX];
         unsigned v = 0;
         int r = 0;
 
@@ -1701,10 +1700,17 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
                 f = rf;
         }
 
-        FOREACH_LINE(line, f, break) {
+        for (;;) {
+                _cleanup_free_ char *line = NULL;
                 char *l;
                 int k;
 
+                k = read_line(f, LONG_LINE_MAX, &line);
+                if (k < 0)
+                        return log_error_errno(k, "Failed to read '%s': %m", fn);
+                if (k == 0)
+                        break;
+
                 v++;
 
                 l = strstrip(line);