hexdump/xxd: a bit more condensed formats

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4b536e1c23cab80e24bde26f52b28bf08c6ca80f..a4483a114c6745212d6af2115c6d59e101d0ec86 100644 (file)
--- 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 3a7e64bb9ac431bb60e0428e4922ec55b8db34a2..813e7fe57793ad6f429bf1f6d1d03511b141cb82 100644 (file)
--- 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);