[PATCH] lib: libfile: Do not ignore errors in close()

[Andrey Smirnov <andrew.smirnov@gmail.com>]

From: Andrey Smirnov <andrew.smirnov@gmail.com>

Some character devices may perform meaningful operations in their
implementation of close() -- a good example would be socfpga.c which
checks if the FPGA was programmed succesfully in it's close() method
-- so ignoring return value of this call may cause false positives in
checking exit status for success.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 lib/libfile.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libfile.c b/lib/libfile.c
index 8acff04..4f21e70 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -262,7 +262,7 @@ int copy_file(const char *src, const char *dst, int verbose)
 	char *rw_buf = NULL;
 	int srcfd = 0, dstfd = 0;
 	int r, w;
-	int ret = 1;
+	int ret = 1, err1 = 0, err2 = 0;
 	void *buf;
 	int total = 0;
 	struct stat statbuf;
@@ -324,11 +324,11 @@ out:
 
 	free(rw_buf);
 	if (srcfd > 0)
-		close(srcfd);
+		err1 = close(srcfd);
 	if (dstfd > 0)
-		close(dstfd);
+		err2 = close(dstfd);
 
-	return ret;
+	return ret ?: err1 ?: err2;
 }
 EXPORT_SYMBOL(copy_file);
 
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox