From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 20 Apr 2018 13:22:29 +0000 (+0200)
Subject: string-util: use fflush_and_check() where appropriate
X-Git-Tag: v239~360^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7e03d2e679ca4fa197e863f532af0a48ec8675d;p=thirdparty%2Fsystemd.git

string-util: use fflush_and_check() where appropriate
---

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 41413b5fa46..07c9938a3f1 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -21,6 +21,7 @@
 #include "terminal-util.h"
 #include "utf8.h"
 #include "util.h"
+#include "fileio.h"
 
 int strcmp_ptr(const char *a, const char *b) {
 
@@ -794,7 +795,7 @@ char *strip_tab_ansi(char **ibuf, size_t *_isz, size_t highlight[2]) {
                 }
         }
 
-        if (ferror(f)) {
+        if (fflush_and_check(f) < 0) {
                 fclose(f);
                 return mfree(obuf);
         }