diff options
author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-08 06:09:58 +0000 |
---|---|---|
committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-08 06:09:58 +0000 |
commit | cc20de446e4fc529d3511a0be5cecba6f015508c (patch) | |
tree | 5039eb97ff1b52037f2569a3b61d7e674ff76eae /package/busybox | |
parent | 5bda08813bc391e4a429a5eefdc068f57b9c2545 (diff) |
add hexdump -C, preserve mbm's sanity.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@351 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rw-r--r-- | package/busybox/patches/130-hexdump.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/busybox/patches/130-hexdump.patch b/package/busybox/patches/130-hexdump.patch new file mode 100644 index 000000000..6da33d48e --- /dev/null +++ b/package/busybox/patches/130-hexdump.patch @@ -0,0 +1,32 @@ +--- busybox-1.00/include/usage.h 2005-03-08 01:10:55.885302128 -0500 ++++ busybox-1.00/include/usage.h 2005-03-08 01:10:39.226834600 -0500 +@@ -956,6 +956,7 @@ + "\t-b\t\tOne-byte octal display\n" \ + "\t-c\t\tOne-byte character display\n" \ + "\t-d\t\tTwo-byte decimal display\n" \ ++ "\t-C\t\tCanonical hex+ASCII display\n" \ + "\t-e FORMAT STRING\n" \ + "\t-f FORMAT FILE\n" \ + "\t-n LENGTH\tInterpret only length bytes of input\n" \ +--- busybox-1.00/util-linux/hexdump.c 2003-03-19 04:13:01.000000000 -0500 ++++ busybox-1.00/util-linux/hexdump.c 2005-03-08 01:02:42.509306680 -0500 +@@ -57,7 +57,7 @@ + + static const char add_first[] = "\"%07.7_Ax\n\""; + +-static const char hexdump_opts[] = "bcdoxe:f:n:s:v"; ++static const char hexdump_opts[] = "bcdoxCe:f:n:s:v"; + + static const struct suffix_mult suffixes[] = { + {"b", 512 }, +@@ -82,6 +82,10 @@ + bb_dump_add(add_strings[(int)(p - hexdump_opts)]); + } else { + /* Sae a little bit of space below by omitting the 'else's. */ ++ if (ch == 'C') { ++ bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); ++ bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); ++ } /* else */ + if (ch == 'e') { + bb_dump_add(optarg); + } /* else */ |