diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-14 17:22:39 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-14 17:22:39 +0000 |
commit | 9ec6708721e8545da8b73c07987450edeeac342f (patch) | |
tree | c4bc3d64c347e8b68136bffd1932dc51bb76a1e8 /openwrt/package/busybox/patches/130-hexdump.patch | |
parent | 03404c74a04d5f864d079631c8b9c4ec499cd84d (diff) |
upgrade busybox to 1.1.0 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2977 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/busybox/patches/130-hexdump.patch')
-rw-r--r-- | openwrt/package/busybox/patches/130-hexdump.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/openwrt/package/busybox/patches/130-hexdump.patch b/openwrt/package/busybox/patches/130-hexdump.patch deleted file mode 100644 index 6da33d48ec..0000000000 --- a/openwrt/package/busybox/patches/130-hexdump.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 */ |