Merge branch 'busybox' into merge

1 files changed, 34 insertions, 27 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 1a273ff2e..9d74d931d 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2518,6 +2518,32 @@ static var *evaluate(node *op, var *res)
                 op1 = op->l.n;
                 debug_printf_eval("opinfo:%08x opn:%08x\n", opinfo, opn);
 
+                /* "delete" is special:
+                 * "delete array[var--]" must evaluate index expr only once,
+                 * must not evaluate it in "execute inevitable things" part.
+                 */
+                if (XC(opinfo & OPCLSMASK) == XC(OC_DELETE)) {
+                        uint32_t info = op1->info & OPCLSMASK;
+                        var *v;
+
+                        debug_printf_eval("DELETE\n");
+                        if (info == OC_VAR) {
+                                v = op1->l.v;
+                        } else if (info == OC_FNARG) {
+                                v = &fnargs[op1->l.aidx];
+                        } else {
+                                syntax_error(EMSG_NOT_ARRAY);
+                        }
+                        if (op1->r.n) { /* array ref? */
+                                const char *s;
+                                s = getvar_s(evaluate(op1->r.n, v1));
+                                hash_remove(iamarray(v), s);
+                        } else {
+                                clear_array(iamarray(v));
+                        }
+                        goto next;
+                }
+
                 /* execute inevitable things */
                 if (opinfo & OF_RES1)
                         L.v = evaluate(op1, v1);
@@ -2625,28 +2651,7 @@ static var *evaluate(node *op, var *res)
                         break;
                 }
 
-                case XC( OC_DELETE ): {
-                        uint32_t info = op1->info & OPCLSMASK;
-                        var *v;
-
-                        if (info == OC_VAR) {
-                                v = op1->l.v;
-                        } else if (info == OC_FNARG) {
-                                v = &fnargs[op1->l.aidx];
-                        } else {
-                                syntax_error(EMSG_NOT_ARRAY);
-                        }
-
-                        if (op1->r.n) {
-                                const char *s;
-                                clrvar(L.v);
-                                s = getvar_s(evaluate(op1->r.n, v1));
-                                hash_remove(iamarray(v), s);
-                        } else {
-                                clear_array(iamarray(v));
-                        }
-                        break;
-                }
+                /* case XC( OC_DELETE ): - moved to happen before arg evaluation */
 
                 case XC( OC_NEWSOURCE ):
                         g_progname = op->l.new_progname;
@@ -2670,12 +2675,14 @@ static var *evaluate(node *op, var *res)
                 /* -- recursive node type -- */
 
                 case XC( OC_VAR ):
+                        debug_printf_eval("VAR\n");
                         L.v = op->l.v;
                         if (L.v == intvar[NF])
                                 split_f0();
                         goto v_cont;
 
                 case XC( OC_FNARG ):
+                        debug_printf_eval("FNARG[%d]\n", op->l.aidx);
                         L.v = &fnargs[op->l.aidx];
  v_cont:
                         res = op->r.n ? findvar(iamarray(L.v), R.s) : L.v;
@@ -3039,7 +3046,8 @@ static var *evaluate(node *op, var *res)
 
                 default:
                         syntax_error(EMSG_POSSIBLE_ERROR);
-                }
+                } /* switch */
+ next:
                 if ((opinfo & OPCLSMASK) <= SHIFT_TIL_THIS)
                         op = op->a.n;
                 if ((opinfo & OPCLSMASK) >= RECUR_FROM_THIS)
@@ -3145,7 +3153,7 @@ static rstream *next_input_file(void)
 }
 
 int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int awk_main(int argc, char **argv)
+int awk_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
         char *opt_F;
@@ -3214,7 +3222,7 @@ int awk_main(int argc, char **argv)
         }
         opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL);
         argv += optind;
-        argc -= optind;
+        //argc -= optind;
         if (opt & OPT_W)
                 bb_error_msg("warning: option -W is ignored");
         if (opt & OPT_F) {
@@ -3251,15 +3259,14 @@ int awk_main(int argc, char **argv)
                 if (!*argv)
                         bb_show_usage();
                 parse_program(*argv++);
-                argc--;
         }
 
         /* fill in ARGV array */
-        setvar_i(intvar[ARGC], argc + 1);
         setari_u(intvar[ARGV], 0, "awk");
         i = 0;
         while (*argv)
                 setari_u(intvar[ARGV], ++i, *argv++);
+        setvar_i(intvar[ARGC], i + 1);
 
         evaluate(beginseq.first, &tv);
         if (!mainseq.first && !endseq.first)