summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2017-01-25 01:58:00 +0100
committerDenys Vlasenko2017-01-25 01:58:00 +0100
commit0f4364775fbc0b716024d5211325045c40b431c9 (patch)
tree9f1bbe20c313154a2f9678816e55eb1944e6a622 /libbb
parent2181fb4af8680730e0157310ffeeb3a35768beb0 (diff)
downloadbusybox-0f4364775fbc0b716024d5211325045c40b431c9.zip
busybox-0f4364775fbc0b716024d5211325045c40b431c9.tar.gz
xxd: new applet
Yet Another Hexdumper function old new delta xxd_main - 364 +364 packed_usage 31046 31116 +70 applet_names 2560 2564 +4 applet_main 1476 1480 +4 rewrite 1022 1013 -9 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 3/1 up/down: 442/-9) Total: 433 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/dump.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libbb/dump.c b/libbb/dump.c
index 154be5d..e9ac0c6 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -165,16 +165,14 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
byte_count_str = "\001";
DO_BYTE_COUNT:
if (fu->bcnt) {
- do {
- if (fu->bcnt == *byte_count_str) {
+ for (;;) {
+ if (fu->bcnt == *byte_count_str)
break;
- }
- } while (*++byte_count_str);
+ if (*++byte_count_str == 0)
+ bb_error_msg_and_die("bad byte count for conversion character %s", p1);
+ }
}
/* Unlike the original, output the remainder of the format string. */
- if (!*byte_count_str) {
- bb_error_msg_and_die("bad byte count for conversion character %s", p1);
- }
pr->bcnt = *byte_count_str;
} else if (*p1 == 'l') {
++p2;