[git commit] hexdump/xxd: a bit more condensed formats

Denys Vlasenko vda.linux at googlemail.com
Wed Jan 25 02:07:39 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=8a2657cbf5fe005914cf58836d2599e65e6c3e34
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/hexdump.c     | 4 ++--
 util-linux/hexdump_xxd.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4b536e1..a4483a1 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 3a7e64b..813e7fe 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);


More information about the busybox-cvs mailing list