[PATCH 1/2] commands: memcpy: Make use of write_full()

[PATCH 1/2] commands: memcpy: Make use of write_full()

[Andrey Smirnov]

Change memcpy to rely on write_full() instead of re-implementing it
locally.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 commands/memcpy.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/commands/memcpy.c b/commands/memcpy.c
index ddaf767ea..803f06e57 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;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] commands: memcpy: Make use of min_t()

[Andrey Smirnov]

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 commands/memcpy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/memcpy.c b/commands/memcpy.c
index 803f06e57..ef25fb7b2 100644
--- a/commands/memcpy.c
+++ b/commands/memcpy.c
@@ -86,7 +86,7 @@ static int do_memcpy(int argc, char *argv[])
 	while (count > 0) {
 		int now, r;
 
-		now = min((loff_t)RW_BUF_SIZE, count);
+		now = min_t(loff_t, RW_BUF_SIZE, count);
 
 		r = read(sourcefd, buf, now);
 		if (r < 0) {
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] commands: memcpy: Make use of write_full()

[Sascha Hauer]

On Tue, Mar 12, 2019 at 12:30:48AM -0700, Andrey Smirnov wrote:
> Change memcpy to rely on write_full() instead of re-implementing it
> locally.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>  commands/memcpy.c | 18 ++++--------------
>  1 file changed, 4 insertions(+), 14 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox