From: Denys Vlasenko Date: Wed, 25 Jan 2017 02:07:39 +0000 (+0100) Subject: hexdump/xxd: a bit more condensed formats X-Git-Tag: 1_27_0~158 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a2657cbf5fe005914cf58836d2599e65e6c3e34;p=oweals%2Fbusybox.git hexdump/xxd: a bit more condensed formats Signed-off-by: Denys Vlasenko --- diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 4b536e1c2..a4483a114 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c @@ -127,8 +127,8 @@ int hexdump_main(int argc, char **argv) if (ch == 'C') { hd_applet: bb_dump_add(dumper, "\"%08.8_Ax\n\""); // final address line after dump - //------------------- "address " 8 * "xx " " " 8 * "xx " - bb_dump_add(dumper, "\"%08.8_ax \"8/1 \"%02x \" \" \"8/1 \"%02x \""); + //------------------- "address " 8 * "xx " " " 8 * "xx " + bb_dump_add(dumper, "\"%08.8_ax \"8/1 \"%02x \"\" \"8/1 \"%02x \""); //------------------- " |ASCII...........|\n" bb_dump_add(dumper, "\" |\"16/1 \"%_p\"\"|\n\""); } diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c index 3a7e64bb9..813e7fe57 100644 --- a/util-linux/hexdump_xxd.c +++ b/util-linux/hexdump_xxd.c @@ -125,7 +125,7 @@ int xxd_main(int argc UNUSED_PARAM, char **argv) free(bigbuf); } - sprintf(buf, "\" \" %u/1 \"%%_p\" \"\n\"", cols); // " ASCII\n" + sprintf(buf, "\" \"%u/1 \"%%_p\"\"\n\"", cols); // " ASCII\n" bb_dump_add(dumper, buf); return bb_dump_dump(dumper, argv);