diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
| commit | 69dccb494a0ee5fececc67f2b7afa7b79368a991 (patch) | |
| tree | 46be84e18d56a7d6a0b3d722cfb402cb93b2f3b3 /lib | |
| parent | 049fb66d212caf2324e6ef2920c44b59858fc04d (diff) | |
| parent | dfd536eb3213a0c29121e0d343963e6fd9ea3111 (diff) | |
| download | barebox-69dccb494a0ee5fececc67f2b7afa7b79368a991.tar.gz barebox-69dccb494a0ee5fececc67f2b7afa7b79368a991.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -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); |