summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-04-09 12:24:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-04-09 12:24:36 +0200
commit9047e0620b50a26838990fcae83c3d007c7e1d28 (patch)
tree0acdbf2dac0f9c61e75197398246eb7bf07d7904 /commands
parentd44e3d642171fa506dcc5a6c1b2babe6b4b813bf (diff)
parent747be0f2bbedcc3bc397ab8be289885ee24e0dbf (diff)
downloadbarebox-9047e0620b50a26838990fcae83c3d007c7e1d28.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/crc.c4
-rw-r--r--commands/firmwareload.c4
-rw-r--r--commands/memcpy.c20
-rw-r--r--commands/of_display_timings.c8
-rw-r--r--commands/of_dump.c6
-rw-r--r--commands/of_fixup_status.c2
-rw-r--r--commands/oftree.c4
7 files changed, 19 insertions, 29 deletions
diff --git a/commands/crc.c b/commands/crc.c
index edb1fb1..580521d 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 <var>", "Set <var> to the checksum result\n")
-BAREBOX_CMD_HELP_OPT ("-s <var>", "Set <var> to the data size\n")
+BAREBOX_CMD_HELP_OPT ("-r <var>", "Set <var> to the checksum result")
+BAREBOX_CMD_HELP_OPT ("-s <var>", "Set <var> to the data size")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(crc32)
diff --git a/commands/firmwareload.c b/commands/firmwareload.c
index 071f25b..dbd43e0 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 <target>", "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 <target>", "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/memcpy.c b/commands/memcpy.c
index ddaf767..ef25fb7 100644
--- a/commands/memcpy.c
+++ b/commands/memcpy.c
@@ -84,9 +84,9 @@ 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);
+ now = min_t(loff_t, RW_BUF_SIZE, count);
r = read(sourcefd, buf, now);
if (r < 0) {
@@ -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;
diff --git a/commands/of_display_timings.c b/commands/of_display_timings.c
index ccf2db0..365ff80 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 7bec0b9..06b8e9f 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 9a4a619..e0da429 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 26a47bb..299c2ed 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 <DTB>", "Load <DTB> to internal devicetree\n")
-BAREBOX_CMD_HELP_OPT ("-s <DTB>", "save internal devicetree to <DTB>\n")
+BAREBOX_CMD_HELP_OPT ("-l <DTB>", "Load <DTB> to internal devicetree")
+BAREBOX_CMD_HELP_OPT ("-s <DTB>", "save internal devicetree to <DTB>")
BAREBOX_CMD_HELP_OPT ("-p", "probe devices from stored device tree")
BAREBOX_CMD_HELP_END