From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Sep 2017 16:01:32 +0000 (+0200)
Subject: fileio: rework read_one_line_file() on top of read_line()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a16ec69cb4f6e63a2d9e20e7c5e27174049f1de5;p=elogind.git

fileio: rework read_one_line_file() on top of read_line()
---

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 7355db031..b20b12ff7 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -176,7 +176,6 @@ fail:
 
 int read_one_line_file(const char *fn, char **line) {
         _cleanup_fclose_ FILE *f = NULL;
-        char t[LINE_MAX], *c;
 
         assert(fn);
         assert(line);
@@ -185,21 +184,7 @@ int read_one_line_file(const char *fn, char **line) {
         if (!f)
                 return -errno;
 
-        if (!fgets(t, sizeof(t), f)) {
-
-                if (ferror(f))
-                        return errno > 0 ? -errno : -EIO;
-
-                t[0] = 0;
-        }
-
-        c = strdup(t);
-        if (!c)
-                return -ENOMEM;
-        truncate_nl(c);
-
-        *line = c;
-        return 0;
+        return read_line(f, LONG_LINE_MAX, line);
 }
 
 int verify_file(const char *fn, const char *blob, bool accept_extra_nl) {