1 files changed, 22 insertions, 18 deletions

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4a7f641db..25f771201 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -41,19 +41,21 @@
 //usage:       "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
 //usage:#define hexdump_full_usage "\n\n"
 //usage:       "Display FILEs (or stdin) in a user specified format\n"
-//usage:     "\n        -b              One-byte octal display"
-//usage:     "\n        -c              One-byte character display"
-//usage:     "\n        -C              Canonical hex+ASCII, 16 bytes per line"
-//usage:     "\n        -d              Two-byte decimal display"
-//usage:     "\n        -e FORMAT_STRING"
+//usage:     "\n        -b              1-byte octal display"
+//usage:     "\n        -c              1-byte character display"
+//usage:     "\n        -d              2-byte decimal display"
+//usage:     "\n        -o              2-byte octal display"
+//usage:     "\n        -x              2-byte hex display"
+//usage:     "\n        -C              hex+ASCII 16 bytes per line"
+//usage:     "\n        -v              Show all (no dup folding)"
+//usage:     "\n        -e FORMAT_STR   Example: '16/1 \"%02x|\"\"\\n\"'"
 //usage:     "\n        -f FORMAT_FILE"
-//usage:     "\n        -n LENGTH       Interpret only LENGTH bytes of input"
-//usage:     "\n        -o              Two-byte octal display"
+// exactly the same help text lines in hexdump and xxd:
+//usage:     "\n        -n LENGTH       Show only first LENGTH bytes"
 //usage:     "\n        -s OFFSET       Skip OFFSET bytes"
-//usage:     "\n        -v              Display all input data"
-//usage:     "\n        -x              Two-byte hexadecimal display"
 //usage:        IF_FEATURE_HEXDUMP_REVERSE(
 //usage:     "\n        -R              Reverse of 'hexdump -Cv'")
+// TODO: NONCOMPAT!!! move -R to xxd -r
 //usage:
 //usage:#define hd_trivial_usage
 //usage:       "FILE..."
@@ -83,11 +85,11 @@ static void bb_dump_addfile(dumper_t *dumper, char *name)
 }
 
 static const char *const add_strings[] = {
-        "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",   /* b */
-        "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",   /* c */
-        "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",  /* d */
-        "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",   /* o */
-        "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"", /* x */
+        "\"%07.7_ax \"16/1 \"%03o \"\"\n\"",   /* b */
+        "\"%07.7_ax \"16/1 \"%3_c \"\"\n\"",   /* c */
+        "\"%07.7_ax \"8/2 \"  %05u \"\"\n\"",  /* d */
+        "\"%07.7_ax \"8/2 \" %06o \"\"\n\"",   /* o */
+        "\"%07.7_ax \"8/2 \"   %04x \"\"\n\"", /* x */
 };
 
 static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
@@ -125,9 +127,11 @@ int hexdump_main(int argc, char **argv)
                 /* Save a little bit of space below by omitting the 'else's. */
                 if (ch == 'C') {
  hd_applet:
-                        bb_dump_add(dumper, "\"%08.8_Ax\n\"");
-                        bb_dump_add(dumper, "\"%08.8_ax  \" 8/1 \"%02x \" \"  \" 8/1 \"%02x \" ");
-                        bb_dump_add(dumper, "\"  |\" 16/1 \"%_p\" \"|\\n\"");
+                        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 \"");
+                        //------------------- "  |ASCII...........|\n"
+                        bb_dump_add(dumper, "\"  |\"16/1 \"%_p\"\"|\n\"");
                 }
                 if (ch == 'e') {
                         bb_dump_add(dumper, optarg);
@@ -158,7 +162,7 @@ int hexdump_main(int argc, char **argv)
 
         if (!dumper->fshead) {
                 bb_dump_add(dumper, add_first);
-                bb_dump_add(dumper, "\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
+                bb_dump_add(dumper, "\"%07.7_ax \"8/2 \"%04x \"\"\n\"");
         }
 
         argv += optind;