[PATCH 6/7] copy_file: handle write return value correctly
Sascha Hauer
s.hauer at pengutronix.de
Mon Apr 11 10:18:40 EDT 2011
write() does not necessarily consume all input, handle this
case correctly.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
lib/copy_file.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/copy_file.c b/lib/copy_file.c
index 7083531..809befe 100644
--- a/lib/copy_file.c
+++ b/lib/copy_file.c
@@ -17,6 +17,7 @@ int copy_file(const char *src, const char *dst)
int srcfd = 0, dstfd = 0;
int r, w;
int ret = 1;
+ void *buf;
rw_buf = xmalloc(RW_BUF_SIZE);
@@ -40,10 +41,16 @@ int copy_file(const char *src, const char *dst)
}
if (!r)
break;
- w = write(dstfd, rw_buf, r);
- if (w < 0) {
- perror("write");
- goto out;
+
+ buf = rw_buf;
+ while (r) {
+ w = write(dstfd, buf, r);
+ if (w < 0) {
+ perror("write");
+ goto out;
+ }
+ buf += w;
+ r -= w;
}
}
--
1.7.2.3
More information about the barebox
mailing list