traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / editors / awk.c

diff --git a/editors/awk.c b/editors/awk.c
index cef73342c2d71a03f3590309a2e5a2d5c0c2cec7..ce6c9b726d80c4cefb74d48dc4e79ecbe69a442f 100644 (file)
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -114,7 +114,7 @@ typedef struct nvblock_s {
        var *pos;
        struct nvblock_s *prev;
        struct nvblock_s *next;
-       var nv[0];
+       var nv[];
 } nvblock;
 
 typedef struct tsplitter_s {
@@ -250,7 +250,7 @@ enum {
 
 /* builtins */
 enum {
-       B_a2,   B_ix,   B_ma,   B_sp,   B_ss,   B_ti,   B_lo,   B_up,
+       B_a2,   B_ix,   B_ma,   B_sp,   B_ss,   B_ti,   B_mt,   B_lo,   B_up,
        B_ge,   B_gs,   B_su,
        B_an,   B_co,   B_ls,   B_or,   B_rs,   B_xo,
 };
@@ -299,7 +299,7 @@ static const char tokenlist[] ALIGN1 =
        "\4rand"    "\3sin"     "\4sqrt"    "\5srand"
        "\6gensub"  "\4gsub"    "\5index"   "\6length"
        "\5match"   "\5split"   "\7sprintf" "\3sub"
-       "\6substr"  "\7systime" "\10strftime"
+       "\6substr"  "\7systime" "\10strftime" "\6mktime"
        "\7tolower" "\7toupper" NTC
        "\7getline" NTC
        "\4func"    "\10function"   NTC
@@ -353,7 +353,7 @@ static const uint32_t tokeninfo[] = {
        OC_FBLTIN|F_rn,    OC_FBLTIN|Nx|F_si, OC_FBLTIN|Nx|F_sq, OC_FBLTIN|Nx|F_sr,
        OC_B|B_ge|P(0xd6), OC_B|B_gs|P(0xb6), OC_B|B_ix|P(0x9b), OC_FBLTIN|Sx|F_le,
        OC_B|B_ma|P(0x89), OC_B|B_sp|P(0x8b), OC_SPRINTF,        OC_B|B_su|P(0xb6),
-       OC_B|B_ss|P(0x8f), OC_FBLTIN|F_ti,    OC_B|B_ti|P(0x0b),
+       OC_B|B_ss|P(0x8f), OC_FBLTIN|F_ti,    OC_B|B_ti|P(0x0b), OC_B|B_mt|P(0x0b),
        OC_B|B_lo|P(0x49), OC_B|B_up|P(0x49),
        OC_GETLINE|SV|P(0),
        0,      0,
@@ -486,7 +486,7 @@ struct globals2 {
 #define fsplitter    (G.fsplitter   )
 #define rsplitter    (G.rsplitter   )
 #define INIT_G() do { \
-       SET_PTR_TO_GLOBALS(xzalloc(sizeof(G1) + sizeof(G)) + sizeof(G1)); \
+       SET_PTR_TO_GLOBALS((char*)xzalloc(sizeof(G1)+sizeof(G)) + sizeof(G1)); \
        G.next_token__ltclass = TC_OPTERM; \
        G.evaluate__seed = 1; \
 } while (0)
@@ -765,11 +765,9 @@ static var *setvar_u(var *v, const char *value)
 /* set array element to user string */
 static void setari_u(var *a, int idx, const char *s)
 {
-       char sidx[sizeof(int)*3 + 1];
        var *v;
 
-       sprintf(sidx, "%d", idx);
-       v = findvar(iamarray(a), sidx);
+       v = findvar(iamarray(a), itoa(idx));
        setvar_u(v, s);
 }
 
@@ -2001,11 +1999,38 @@ static int awk_sub(node *rn, const char *repl, int nm, var *src, var *dest, int
        return i;
 }
 
-static var *exec_builtin(node *op, var *res)
+static NOINLINE int do_mktime(const char *ds)
+{
+       struct tm then;
+       int count;
+
+       /*memset(&then, 0, sizeof(then)); - not needed */
+       then.tm_isdst = -1; /* default is unknown */
+
+       /* manpage of mktime says these fields are ints,
+        * so we can sscanf stuff directly into them */
+       count = sscanf(ds, "%u %u %u %u %u %u %d",
+               &then.tm_year, &then.tm_mon, &then.tm_mday,
+               &then.tm_hour, &then.tm_min, &then.tm_sec,
+               &then.tm_isdst);
+
+       if (count < 6
+        || (unsigned)then.tm_mon < 1
+        || (unsigned)then.tm_year < 1900
+       ) {
+               return -1;
+       }
+
+       then.tm_mon -= 1;
+       then.tm_year -= 1900;
+
+       return mktime(&then);
+}
+
+static NOINLINE var *exec_builtin(node *op, var *res)
 {
 #define tspl (G.exec_builtin__tspl)
 
-       int (*to_xxx)(int);
        var *tv;
        node *an[4];
        var *av[4];
@@ -2035,7 +2060,8 @@ static var *exec_builtin(node *op, var *res)
        if ((uint32_t)nargs < (info >> 30))
                syntax_error(EMSG_TOO_FEW_ARGS);
 
-       switch (info & OPNMASK) {
+       info &= OPNMASK;
+       switch (info) {
 
        case B_a2:
 #if ENABLE_FEATURE_AWK_LIBM
@@ -2100,15 +2126,12 @@ static var *exec_builtin(node *op, var *res)
                break;
 
        case B_lo:
-               to_xxx = tolower;
-               goto lo_cont;
-
        case B_up:
-               to_xxx = toupper;
- lo_cont:
                s1 = s = xstrdup(as[0]);
                while (*s1) {
-                       *s1 = (*to_xxx)(*s1);
+                       //*s1 = (info == B_up) ? toupper(*s1) : tolower(*s1);
+                       if ((unsigned char)((*s1 | 0x20) - 'a') <= ('z' - 'a'))
+                               *s1 = (info == B_up) ? (*s1 & 0xdf) : (*s1 | 0x20);
                        s1++;
                }
                setvar_p(res, s);
@@ -2150,6 +2173,10 @@ static var *exec_builtin(node *op, var *res)
                setvar_s(res, g_buf);
                break;
 
+       case B_mt:
+               setvar_i(res, do_mktime(as[0]));
+               break;
+
        case B_ma:
                re = as_regex(an[1], &sreg);
                n = regexec(re, as[0], 1, pmatch, 0);
@@ -2525,7 +2552,7 @@ static var *evaluate(node *op, var *res)
                                break;
 
                        case F_sy:
-                               fflush(NULL);
+                               fflush_all();
                                R.d = (ENABLE_FEATURE_ALLOW_EXEC && L.s && *L.s)
                                                ? (system(L.s) >> 8) : 0;
                                break;
@@ -2538,7 +2565,7 @@ static var *evaluate(node *op, var *res)
                                                X.rsm = newfile(L.s);
                                                fflush(X.rsm->F);
                                        } else {
-                                               fflush(NULL);
+                                               fflush_all();
                                        }
                                }
                                break;