diff options
Diffstat (limited to 'package/busybox/patches/006-od-bloat.patch')
-rw-r--r-- | package/busybox/patches/006-od-bloat.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/package/busybox/patches/006-od-bloat.patch b/package/busybox/patches/006-od-bloat.patch index 8c608ca87..ff501acdb 100644 --- a/package/busybox/patches/006-od-bloat.patch +++ b/package/busybox/patches/006-od-bloat.patch @@ -1,12 +1,12 @@ -diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c ---- busybox-1.17.1.orig/coreutils/od.c 2010-07-06 04:25:53.000000000 +0200 -+++ busybox-1.17.1/coreutils/od.c 2010-08-15 12:50:31.000000000 +0200 -@@ -13,210 +13,5 @@ +diff -Nur busybox-1.18.1.orig/coreutils/od.c busybox-1.18.1/coreutils/od.c +--- busybox-1.18.1.orig/coreutils/od.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/coreutils/od.c 2010-12-25 23:18:48.000000000 +0100 +@@ -13,210 +13,4 @@ #include "libbb.h" -#if ENABLE_DESKTOP - /* This one provides -t (busybox's own build script needs it) */ +-/* This one provides -t (busybox's own build script needs it) */ #include "od_bloaty.c" -#else - @@ -102,7 +102,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - * the offset is changed as well. This isn't pretty, - * but it's easy. - */ --#define TYPE_OFFSET 7 +-#define TYPE_OFFSET 7 - { - char x_or_d; - if (base == 16) { @@ -122,19 +122,19 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c -} - -static const char *const add_strings[] = { -- "16/1 \"%3_u \" \"\\n\"", /* a */ -- "8/2 \" %06o \" \"\\n\"", /* B, o */ -- "16/1 \"%03o \" \"\\n\"", /* b */ -- "16/1 \"%3_c \" \"\\n\"", /* c */ -- "8/2 \" %05u \" \"\\n\"", /* d */ -- "4/4 \" %010u \" \"\\n\"", /* D */ -- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ -- "4/4 \" %14.7e \" \"\\n\"", /* f */ -- "4/4 \" %08x \" \"\\n\"", /* H, X */ -- "8/2 \" %04x \" \"\\n\"", /* h, x */ -- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ -- "8/2 \" %6d \" \"\\n\"", /* i */ -- "4/4 \" %011o \" \"\\n\"", /* O */ +- "16/1 \"%3_u \" \"\\n\"", /* a */ +- "8/2 \" %06o \" \"\\n\"", /* B, o */ +- "16/1 \"%03o \" \"\\n\"", /* b */ +- "16/1 \"%3_c \" \"\\n\"", /* c */ +- "8/2 \" %05u \" \"\\n\"", /* d */ +- "4/4 \" %010u \" \"\\n\"", /* D */ +- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ +- "4/4 \" %14.7e \" \"\\n\"", /* f */ +- "4/4 \" %08x \" \"\\n\"", /* H, X */ +- "8/2 \" %04x \" \"\\n\"", /* h, x */ +- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ +- "8/2 \" %6d \" \"\\n\"", /* i */ +- "4/4 \" %011o \" \"\\n\"", /* O */ -}; - -static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; @@ -166,7 +166,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - bb_dump_add(dumper, "\" \""); - } - bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); -- } else { /* P, p, s, w, or other unhandled */ +- } else { /* P, p, s, w, or other unhandled */ - bb_show_usage(); - } - } |