6da33d48ec0a175a264e1fe4aa4a43769f3edc2b
[openwrt/svn-archive/archive.git] / openwrt / package / busybox / patches / 130-hexdump.patch
1 --- busybox-1.00/include/usage.h 2005-03-08 01:10:55.885302128 -0500
2 +++ busybox-1.00/include/usage.h 2005-03-08 01:10:39.226834600 -0500
3 @@ -956,6 +956,7 @@
4 "\t-b\t\tOne-byte octal display\n" \
5 "\t-c\t\tOne-byte character display\n" \
6 "\t-d\t\tTwo-byte decimal display\n" \
7 + "\t-C\t\tCanonical hex+ASCII display\n" \
8 "\t-e FORMAT STRING\n" \
9 "\t-f FORMAT FILE\n" \
10 "\t-n LENGTH\tInterpret only length bytes of input\n" \
11 --- busybox-1.00/util-linux/hexdump.c 2003-03-19 04:13:01.000000000 -0500
12 +++ busybox-1.00/util-linux/hexdump.c 2005-03-08 01:02:42.509306680 -0500
13 @@ -57,7 +57,7 @@
14
15 static const char add_first[] = "\"%07.7_Ax\n\"";
16
17 -static const char hexdump_opts[] = "bcdoxe:f:n:s:v";
18 +static const char hexdump_opts[] = "bcdoxCe:f:n:s:v";
19
20 static const struct suffix_mult suffixes[] = {
21 {"b", 512 },
22 @@ -82,6 +82,10 @@
23 bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
24 } else {
25 /* Sae a little bit of space below by omitting the 'else's. */
26 + if (ch == 'C') {
27 + bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
28 + bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\"");
29 + } /* else */
30 if (ch == 'e') {
31 bb_dump_add(optarg);
32 } /* else */