|
 |
dd65c9 |
From 29d296bbe3ce769d64f90a08ba0e091725140704 Mon Sep 17 00:00:00 2001
|
|
|
dd65c9 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
dd65c9 |
Date: Sun, 24 Sep 2017 14:27:21 +0200
|
|
|
dd65c9 |
Subject: [PATCH] fileio: return 0 from read_one_line_file on success
|
|
|
dd65c9 |
|
|
|
dd65c9 |
Fixup for f4b51a2d09. Suggested by Evgeny Vereshchagin.
|
|
|
dd65c9 |
|
|
|
dd65c9 |
(cherry picked from commit 2e33df93dee35af986683d1226f93e0f9659de5d)
|
|
|
dd65c9 |
|
|
|
dd65c9 |
Resolves: #1503106
|
|
|
dd65c9 |
---
|
|
|
dd65c9 |
src/shared/fileio.c | 4 +++-
|
|
|
dd65c9 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
dd65c9 |
|
|
|
dd65c9 |
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
|
|
Pablo Greco |
48fc63 |
index 4880a4941f..65a0753c24 100644
|
|
|
dd65c9 |
--- a/src/shared/fileio.c
|
|
|
dd65c9 |
+++ b/src/shared/fileio.c
|
|
|
dd65c9 |
@@ -109,6 +109,7 @@ int write_string_file_atomic(const char *fn, const char *line) {
|
|
|
dd65c9 |
|
|
|
dd65c9 |
int read_one_line_file(const char *fn, char **line) {
|
|
|
dd65c9 |
_cleanup_fclose_ FILE *f = NULL;
|
|
|
dd65c9 |
+ int r;
|
|
|
dd65c9 |
|
|
|
dd65c9 |
assert(fn);
|
|
|
dd65c9 |
assert(line);
|
|
|
dd65c9 |
@@ -117,7 +118,8 @@ int read_one_line_file(const char *fn, char **line) {
|
|
|
dd65c9 |
if (!f)
|
|
|
dd65c9 |
return -errno;
|
|
|
dd65c9 |
|
|
|
dd65c9 |
- return read_line(f, LONG_LINE_MAX, line);
|
|
|
dd65c9 |
+ r = read_line(f, LONG_LINE_MAX, line);
|
|
|
dd65c9 |
+ return r < 0 ? r : 0;
|
|
|
dd65c9 |
}
|
|
|
dd65c9 |
|
|
|
dd65c9 |
int read_full_stream(FILE *f, char **contents, size_t *size) {
|