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 From bbe652979c707edd5f42c70cd198c837e765edf8 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 12 Mar 2019 00:30:49 -0700 Subject: commands: memcpy: Make use of min_t() Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- commands/memcpy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands') diff --git a/commands/memcpy.c b/commands/memcpy.c index 803f06e574..ef25fb7b23 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) { -- cgit v1.2.3 From 747be0f2bbedcc3bc397ab8be289885ee24e0dbf Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Thu, 4 Apr 2019 16:53:14 +0200 Subject: commands: unify newlines for options The BAREBOX_CMD_HELP_OPT macro adds a newline to the string, but users of the macro inconsistently add another newline resulting in empty newlines for some commands, but not for others. Remove any newline in the description and rely on BAREBOX_CMD_HELP_OPT for the formatting. Signed-off-by: Michael Tretter Signed-off-by: Sascha Hauer --- commands/crc.c | 4 ++-- commands/firmwareload.c | 4 ++-- commands/of_display_timings.c | 8 ++++---- commands/of_dump.c | 6 +++--- commands/of_fixup_status.c | 2 +- commands/oftree.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'commands') diff --git a/commands/crc.c b/commands/crc.c index edb1fb125c..580521d677 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -138,8 +138,8 @@ BAREBOX_CMD_HELP_OPT ("-F FILE", "Use file to compare.") #endif BAREBOX_CMD_HELP_OPT ("-v CRC", "Verify") BAREBOX_CMD_HELP_OPT ("-V FILE", "Verify with CRC read from FILE") -BAREBOX_CMD_HELP_OPT ("-r ", "Set to the checksum result\n") -BAREBOX_CMD_HELP_OPT ("-s ", "Set to the data size\n") +BAREBOX_CMD_HELP_OPT ("-r ", "Set to the checksum result") +BAREBOX_CMD_HELP_OPT ("-s ", "Set to the data size") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(crc32) diff --git a/commands/firmwareload.c b/commands/firmwareload.c index 071f25be99..dbd43e046d 100644 --- a/commands/firmwareload.c +++ b/commands/firmwareload.c @@ -55,8 +55,8 @@ static int do_firmwareload(int argc, char *argv[]) BAREBOX_CMD_HELP_START(firmwareload) BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT("-t ", "define the firmware handler by name\n") -BAREBOX_CMD_HELP_OPT("-l\t", "list devices capable of firmware loading\n") +BAREBOX_CMD_HELP_OPT("-t ", "define the firmware handler by name") +BAREBOX_CMD_HELP_OPT("-l\t", "list devices capable of firmware loading") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(firmwareload) diff --git a/commands/of_display_timings.c b/commands/of_display_timings.c index ccf2db0da5..365ff80c36 100644 --- a/commands/of_display_timings.c +++ b/commands/of_display_timings.c @@ -148,10 +148,10 @@ static int do_of_display_timings(int argc, char *argv[]) BAREBOX_CMD_HELP_START(of_display_timings) BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT("-l", "list path of all available display-timings\n") -BAREBOX_CMD_HELP_OPT("-s", "list path of all selected display-timings\n") -BAREBOX_CMD_HELP_OPT("-S path", "select display-timings and register oftree fixup\n") -BAREBOX_CMD_HELP_OPT("-f dtb", "work on dtb. Has no effect on -s option\n") +BAREBOX_CMD_HELP_OPT("-l", "list path of all available display-timings") +BAREBOX_CMD_HELP_OPT("-s", "list path of all selected display-timings") +BAREBOX_CMD_HELP_OPT("-S path", "select display-timings and register oftree fixup") +BAREBOX_CMD_HELP_OPT("-f dtb", "work on dtb. Has no effect on -s option") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(of_display_timings) diff --git a/commands/of_dump.c b/commands/of_dump.c index 7bec0b925e..06b8e9fcda 100644 --- a/commands/of_dump.c +++ b/commands/of_dump.c @@ -139,9 +139,9 @@ out: BAREBOX_CMD_HELP_START(of_dump) BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT ("-f dtb", "work on dtb instead of internal devicetree\n") -BAREBOX_CMD_HELP_OPT ("-F", "return fixed devicetree\n") -BAREBOX_CMD_HELP_OPT ("-n", "Print node names only, no properties\n") +BAREBOX_CMD_HELP_OPT ("-f dtb", "work on dtb instead of internal devicetree") +BAREBOX_CMD_HELP_OPT ("-F", "return fixed devicetree") +BAREBOX_CMD_HELP_OPT ("-n", "Print node names only, no properties") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(of_dump) diff --git a/commands/of_fixup_status.c b/commands/of_fixup_status.c index 9a4a619195..e0da429ac3 100644 --- a/commands/of_fixup_status.c +++ b/commands/of_fixup_status.c @@ -59,7 +59,7 @@ static int do_of_fixup_status(int argc, char *argv[]) BAREBOX_CMD_HELP_START(of_fixup_status) BAREBOX_CMD_HELP_TEXT("Options:") BAREBOX_CMD_HELP_OPT("-d", "disable node") -BAREBOX_CMD_HELP_OPT("path", "Node path\n") +BAREBOX_CMD_HELP_OPT("path", "Node path") BAREBOX_CMD_HELP_TEXT("Register a fixup to enable or disable a device tree node.") BAREBOX_CMD_HELP_TEXT("Nodes are enabled on default. Disabled with -d.") BAREBOX_CMD_HELP_END diff --git a/commands/oftree.c b/commands/oftree.c index 26a47bb581..299c2edfcd 100644 --- a/commands/oftree.c +++ b/commands/oftree.c @@ -123,8 +123,8 @@ out: BAREBOX_CMD_HELP_START(oftree) BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT ("-l ", "Load to internal devicetree\n") -BAREBOX_CMD_HELP_OPT ("-s ", "save internal devicetree to \n") +BAREBOX_CMD_HELP_OPT ("-l ", "Load to internal devicetree") +BAREBOX_CMD_HELP_OPT ("-s ", "save internal devicetree to ") BAREBOX_CMD_HELP_OPT ("-p", "probe devices from stored device tree") BAREBOX_CMD_HELP_END -- cgit v1.2.3