|
 |
17b0f1 |
From aab6aeb2529a1e9b51eeadf91decd06e03af5da1 Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Jan Synacek <jsynacek@redhat.com>
|
|
|
17b0f1 |
Date: Thu, 23 Nov 2017 09:23:34 +0100
|
|
|
17b0f1 |
Subject: [PATCH] fileio: rework read_one_line_file() on top of read_line()
|
|
|
17b0f1 |
|
|
|
17b0f1 |
(cherry picked from commit f4b51a2d092685c9a080e84130fec2d74c834f5c)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Resolves: #1503106
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/shared/fileio.c | 18 ++----------------
|
|
|
17b0f1 |
1 file changed, 2 insertions(+), 16 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
|
|
|
17b0f1 |
index 1077375735..be775f982a 100644
|
|
|
17b0f1 |
--- a/src/shared/fileio.c
|
|
|
17b0f1 |
+++ b/src/shared/fileio.c
|
|
|
17b0f1 |
@@ -25,6 +25,7 @@
|
|
|
17b0f1 |
#include "strv.h"
|
|
|
17b0f1 |
#include "utf8.h"
|
|
|
17b0f1 |
#include "ctype.h"
|
|
|
17b0f1 |
+#include "def.h"
|
|
|
17b0f1 |
#include "fileio.h"
|
|
|
17b0f1 |
|
|
|
17b0f1 |
int write_string_stream(FILE *f, const char *line) {
|
|
|
17b0f1 |
@@ -108,7 +109,6 @@ int write_string_file_atomic(const char *fn, const char *line) {
|
|
|
17b0f1 |
|
|
|
17b0f1 |
int read_one_line_file(const char *fn, char **line) {
|
|
|
17b0f1 |
_cleanup_fclose_ FILE *f = NULL;
|
|
|
17b0f1 |
- char t[LINE_MAX], *c;
|
|
|
17b0f1 |
|
|
|
17b0f1 |
assert(fn);
|
|
|
17b0f1 |
assert(line);
|
|
|
17b0f1 |
@@ -117,21 +117,7 @@ int read_one_line_file(const char *fn, char **line) {
|
|
|
17b0f1 |
if (!f)
|
|
|
17b0f1 |
return -errno;
|
|
|
17b0f1 |
|
|
|
17b0f1 |
- if (!fgets(t, sizeof(t), f)) {
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- if (ferror(f))
|
|
|
17b0f1 |
- return errno ? -errno : -EIO;
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- t[0] = 0;
|
|
|
17b0f1 |
- }
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- c = strdup(t);
|
|
|
17b0f1 |
- if (!c)
|
|
|
17b0f1 |
- return -ENOMEM;
|
|
|
17b0f1 |
- truncate_nl(c);
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- *line = c;
|
|
|
17b0f1 |
- return 0;
|
|
|
17b0f1 |
+ return read_line(f, LONG_LINE_MAX, line);
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
int read_full_stream(FILE *f, char **contents, size_t *size) {
|