diff options
author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2015-08-14 13:31:58 -0700 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-19 16:23:54 +0200 |
commit | c8a26925c974fa91c3a4e53f1a3bfd7bf57bcf98 (patch) | |
tree | c969489f289ed7712252403efb52052e1cefa1c7 /lib/libfile.c | |
parent | 81caed9cce82fdf2e04be07d360fc4019b0c5641 (diff) | |
download | barebox-c8a26925c974fa91c3a4e53f1a3bfd7bf57bcf98.tar.gz barebox-c8a26925c974fa91c3a4e53f1a3bfd7bf57bcf98.tar.xz |
lib: libfile: Do not ignore errors in close()
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib/libfile.c')
-rw-r--r-- | lib/libfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libfile.c b/lib/libfile.c index ba03700aba..a27460c10d 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; void *buf; int total = 0; struct stat statbuf; @@ -326,9 +326,9 @@ out: if (srcfd > 0) close(srcfd); if (dstfd > 0) - close(dstfd); + err1 = close(dstfd); - return ret; + return ret ?: err1; } EXPORT_SYMBOL(copy_file); |