summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2019-03-12 00:32:07 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2019-03-13 09:41:53 +0100
commitd696289d6eba0b578b3a9ba506fc23cdc507b025 (patch)
tree72d197593b3df663bdd0e3950c5873be87072e9e /lib
parentbbe652979c707edd5f42c70cd198c837e765edf8 (diff)
downloadbarebox-d696289d6eba0b578b3a9ba506fc23cdc507b025.tar.gz
barebox-d696289d6eba0b578b3a9ba506fc23cdc507b025.tar.xz
libfile: Make use of write_full() in copy_file()
Change copy_file() to rely on write_full() instead of re-implementing it locally. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/libfile.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/libfile.c b/lib/libfile.c
index 9a223d2328..1b28418b65 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -323,10 +323,9 @@ int copy_file(const char *src, const char *dst, int verbose)
{
char *rw_buf = NULL;
int srcfd = 0, dstfd = 0;
- int r, w;
+ int r;
int ret = 1, err1 = 0;
int mode;
- void *buf;
int total = 0;
struct stat srcstat, dststat;
@@ -370,18 +369,13 @@ int copy_file(const char *src, const char *dst, int verbose)
if (!r)
break;
- buf = rw_buf;
- while (r) {
- w = write(dstfd, buf, r);
- if (w < 0) {
- perror("write");
- goto out;
- }
- buf += w;
- r -= w;
- total += w;
+ if (write_full(dstfd, rw_buf, r) < 0) {
+ perror("write");
+ goto out;
}
+ total += r;
+
if (verbose) {
if (srcstat.st_size && srcstat.st_size != FILESIZE_MAX)
show_progress(total);