From b6bdaf7a4ff3c7b0a89e5c3a5a59ce85894d109c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 12 Mar 2019 00:30:48 -0700 Subject: commands: memcpy: Make use of write_full() Change memcpy to rely on write_full() instead of re-implementing it locally. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- commands/memcpy.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'commands') diff --git a/commands/memcpy.c b/commands/memcpy.c index ddaf767eac..803f06e574 100644 --- a/commands/memcpy.c +++ b/commands/memcpy.c @@ -84,7 +84,7 @@ static int do_memcpy(int argc, char *argv[]) buf = xmalloc(RW_BUF_SIZE); while (count > 0) { - int now, r, w, tmp; + int now, r; now = min((loff_t)RW_BUF_SIZE, count); @@ -97,19 +97,9 @@ static int do_memcpy(int argc, char *argv[]) if (!r) break; - tmp = 0; - now = r; - while (now) { - w = write(destfd, buf + tmp, now); - if (w < 0) { - perror("write"); - goto out; - } - if (!w) - break; - - now -= w; - tmp += w; + if (write_full(destfd, buf, r) < 0) { + perror("write"); + goto out; } count -= r; -- cgit v1.2.3