Merge branch 'busybox' into merge

2 files changed, 86 insertions, 43 deletions

diff --git a/coreutils/od.c b/coreutils/od.c
index 6f22331e0..a7b1ba444 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -22,7 +22,9 @@
 
 //usage:#if !ENABLE_DESKTOP
 //usage:#define od_trivial_usage
-//usage:       "[-aBbcDdeFfHhIiLlOovXx] [FILE]"
+//usage:       "[-abcdeFfhiloxsv] [FILE]"
+// We also support -BDOHXIL, but they are not documented in coreutils 9.1
+// manpage/help, so don't show them either.
 //usage:#define od_full_usage "\n\n"
 //usage:       "Print FILE (or stdin) unambiguously, as octal bytes by default"
 //usage:#endif
@@ -144,29 +146,50 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
         }
 }
 
+// bb_dump_add():
+// A format string contains format units separated by [optional] whitespace.
+// A format unit contains up to three items: an iteration count, a byte count,
+// and a format.
+// The iteration count is an optional integer (default 1).
+// Each format is applied iteration count times.
+// The byte count is an optional integer. It defines the number
+// of bytes to be interpreted by each iteration of the format.
+// If an iteration count and/or a byte count is specified, a slash must be
+// placed after the iteration count and/or before the byte count
+// to disambiguate them.
+// The printf-style format is required and must be surrounded by " "s.
+// (Below, each string contains two format units)
 static const char *const add_strings[] ALIGN_PTR = {
-        "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\"",            /* 0: a */
+        "8/2 \" %06o\""    "\"\n\"",            /* 1: B (undocumented in od), o */
+        "16/1 \" %03o\""   "\"\n\"",            /* 2: b */
+        "16/1 \" %3_c\""   "\"\n\"",            /* 3: c */
+        "8/2 \" %5u\""     "\"\n\"",            /* 4: d */
+        "4/4 \" %10u\""    "\"\n\"",            /* 5: D */
+        "2/8 \" %24.14e\"" "\"\n\"",            /* 6: e (undocumented in od), F */
+        "4/4 \" %15.7e\""  "\"\n\"",            /* 7: f */
+        "4/4 \" %08x\""    "\"\n\"",            /* 8: H, X */
+        "8/2 \" %04x\""    "\"\n\"",            /* 9: h, x */
+        "4/4 \" %11d\""    "\"\n\"",            /* 10: i */
+        "4/4 \" %011o\""   "\"\n\"",            /* 11: O */
+        "8/2 \" %6d\""     "\"\n\"",            /* 12: s */
+        /* -I,L,l: depend on word width of the arch (what is "long"?) */
+#if ULONG_MAX > 0xffffffff
+        "2/8 \" %20lld\""  "\"\n\"",            /* 13: I, L, l */
+#define L_ 13
+#else
+        /* 32-bit arch: -I,L,l are the same as -i */
+#define L_ 10
+#endif
 };
 
-static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
+static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxsv";
 
 static const char od_o2si[] ALIGN1 = {
-        0, 1, 2, 3, 5,
-        4, 6, 6, 7, 8,
-        9, 0xa, 0xb, 0xa, 0xa,
-        0xb, 1, 8, 9,
+        0, 1, 2, 3, 5,     /* aBbcD */
+        4, 6, 6, 7, 8,     /* deFfH */
+        9, L_, 10, L_, L_, /* hIiLl */
+        11, 1, 8, 9, 12    /* OoXxs */
 };
 
 int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -184,19 +207,21 @@ int od_main(int argc, char **argv)
                         if (first) {
                                 first = 0;
                                 bb_dump_add(dumper, "\"%07.7_Ao\n\"");
-                                bb_dump_add(dumper, "\"%07.7_ao  \"");
+                                bb_dump_add(dumper, "\"%07.7_ao\"");
                         } else {
-                                bb_dump_add(dumper, "\"         \"");
+                                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, w, or other unhandled */
                         bb_show_usage();
                 }
         }
         if (!dumper->fshead) {
                 bb_dump_add(dumper, "\"%07.7_Ao\n\"");
-                bb_dump_add(dumper, "\"%07.7_ao  \" 8/2 \"%06o \" \"\\n\"");
+                bb_dump_add(dumper, "\"%07.7_ao\"");
+                bb_dump_add(dumper, add_strings[1]); /* -o format is default */
         }
+        dumper->od_eofstring = "\n";
 
         argc -= optind;
         argv += optind;
@@ -205,7 +230,7 @@ int od_main(int argc, char **argv)
 
         return bb_dump_dump(dumper, argv);
 }
-#endif /* ENABLE_DESKTOP */
+#endif /* !ENABLE_DESKTOP */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 1830aca83..641d93503 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -27,6 +27,8 @@
 //usage:#if ENABLE_DESKTOP
 //usage:#define od_trivial_usage
 //usage:       "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..."
+// We also support -BDOHXIL, but they are not documented in coreutils 9.1
+// manpage/help, so don't show them either.
 // We don't support:
 // ... [FILE] [[+]OFFSET[.][b]]
 // Support is buggy for:
@@ -43,26 +45,33 @@ enum {
         OPT_b = 1 << 3,
         OPT_c = 1 << 4,
         OPT_d = 1 << 5,
-        OPT_f = 1 << 6,
-        OPT_h = 1 << 7,
-        OPT_i = 1 << 8,
-        OPT_j = 1 << 9,
-        OPT_l = 1 << 10,
-        OPT_o = 1 << 11,
-        OPT_t = 1 << 12,
+        OPT_D = 1 << 6, /* undocumented in coreutils 9.1 */
+        OPT_f = 1 << 7,
+        OPT_h = 1 << 8,
+        OPT_H = 1 << 9, /* undocumented in coreutils 9.1 */
+        OPT_i = 1 << 10,
+        OPT_I = 1 << 11, /* undocumented in coreutils 9.1 */
+        OPT_j = 1 << 12,
+        OPT_l = 1 << 13,
+        OPT_L = 1 << 14, /* undocumented in coreutils 9.1 */
+        OPT_o = 1 << 15,
+        OPT_O = 1 << 16, /* undocumented in coreutils 9.1 */
+        OPT_B = 1 << 17, /* undocumented synonym to -o */
+        OPT_t = 1 << 18,
         /* When zero and two or more consecutive blocks are equal, format
            only the first block and output an asterisk alone on the following
            line to indicate that identical blocks have been elided: */
-        OPT_v = 1 << 13,
-        OPT_x = 1 << 14,
-        OPT_s = 1 << 15,
-        OPT_S = 1 << 16,
-        OPT_w = 1 << 17,
-        OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS,
+        OPT_v = 1 << 19,
+        OPT_x = 1 << 20,
+        OPT_X = 1 << 21, /* undocumented in coreutils 9.1 */
+        OPT_s = 1 << 22,
+        OPT_S = 1 << 23,
+        OPT_w = 1 << 24,
+        OPT_traditional = (1 << 25) * ENABLE_LONG_OPTS,
 };
 
 #define OD_GETOPT32() getopt32long(argv, \
-        "A:N:abcdfhij:lot:*vxsS:w:+:", od_longopts, \
+        "A:N:abcdDfhHiIj:lLoOBt:*vxXsS:w:+:", od_longopts, \
         /* -w with optional param */ \
         /* -S was -s and also had optional parameter */ \
         /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1246,20 +1255,29 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_N) {
                 max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes);
         }
+
         if (opt & OPT_a) decode_format_string("a");
         if (opt & OPT_b) decode_format_string("oC");
         if (opt & OPT_c) decode_format_string("c");
         if (opt & OPT_d) decode_format_string("u2");
+        if (opt & OPT_D) decode_format_string("uI");
         if (opt & OPT_f) decode_format_string("fF");
-        if (opt & OPT_h) decode_format_string("x2");
-        if (opt & OPT_i) decode_format_string("d2");
+        if (opt & (OPT_h|OPT_x)) decode_format_string("x2");
+        if (opt & (OPT_H|OPT_X)) decode_format_string("xI");
+        /* -I,L,l: depend on word width of the arch (what is "long"?) */
+#if ULONG_MAX > 0xffffffff
+        if (opt & OPT_i) decode_format_string("dI");
+        if (opt & (OPT_I|OPT_l|OPT_L)) decode_format_string("dL");
+#else
+        /* 32-bit arch: -I,L,l are the same as -i */
+        if (opt & (OPT_i|OPT_I|OPT_l|OPT_L)) decode_format_string("dI");
+#endif
         if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes);
-        if (opt & OPT_l) decode_format_string("d4");
-        if (opt & OPT_o) decode_format_string("o2");
+        if (opt & (OPT_o|OPT_B)) decode_format_string("o2");
+        if (opt & OPT_O) decode_format_string("oI");
         while (lst_t) {
                 decode_format_string(llist_pop(&lst_t));
         }
-        if (opt & OPT_x) decode_format_string("x2");
         if (opt & OPT_s) decode_format_string("d2");
         if (opt & OPT_S) {
                 G.string_min = xstrtou_sfx(str_S, 0, bkm_suffixes);