Merge branch 'busybox' into merge

3 files changed, 77 insertions, 72 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 86cd9a289..dbb26068d 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -275,18 +275,21 @@ typedef struct tsplitter_s {
                    | TC_STRING | TC_NUMBER | TC_UOPPOST)
 #define TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
 
-#define OF_RES1    0x010000
-#define OF_RES2    0x020000
-#define OF_STR1    0x040000
-#define OF_STR2    0x080000
-#define OF_NUM1    0x100000
-#define OF_CHECKED 0x200000
+#define OF_RES1     0x010000
+#define OF_RES2     0x020000
+#define OF_STR1     0x040000
+#define OF_STR2     0x080000
+#define OF_NUM1     0x100000
+#define OF_CHECKED  0x200000
+#define OF_REQUIRED 0x400000
+
 
 /* combined operator flags */
 #define xx      0
 #define xV      OF_RES2
 #define xS      (OF_RES2 | OF_STR2)
 #define Vx      OF_RES1
+#define Rx      (OF_RES1 | OF_NUM1 | OF_REQUIRED)
 #define VV      (OF_RES1 | OF_RES2)
 #define Nx      (OF_RES1 | OF_NUM1)
 #define NV      (OF_RES1 | OF_NUM1 | OF_RES2)
@@ -425,7 +428,7 @@ static const uint32_t tokeninfo[] = {
         0,
         0, /* \n */
         ST_IF,        ST_DO,        ST_FOR,      OC_BREAK,
-        OC_CONTINUE,  OC_DELETE|Vx, OC_PRINT,
+        OC_CONTINUE,  OC_DELETE|Rx, OC_PRINT,
         OC_PRINTF,    OC_NEXT,      OC_NEXTFILE,
         OC_RETURN|Vx, OC_EXIT|Nx,
         ST_WHILE,
@@ -593,7 +596,7 @@ static const char EMSG_UNEXP_EOS[] ALIGN1 = "Unexpected end of string";
 static const char EMSG_UNEXP_TOKEN[] ALIGN1 = "Unexpected token";
 static const char EMSG_DIV_BY_ZERO[] ALIGN1 = "Division by zero";
 static const char EMSG_INV_FMT[] ALIGN1 = "Invalid format specifier";
-static const char EMSG_TOO_FEW_ARGS[] ALIGN1 = "Too few arguments for builtin";
+static const char EMSG_TOO_FEW_ARGS[] ALIGN1 = "Too few arguments";
 static const char EMSG_NOT_ARRAY[] ALIGN1 = "Not an array";
 static const char EMSG_POSSIBLE_ERROR[] ALIGN1 = "Possible syntax error";
 static const char EMSG_UNDEF_FUNC[] ALIGN1 = "Call to undefined function";
@@ -1269,7 +1272,7 @@ static node *parse_expr(uint32_t iexp)
         debug_printf_parse("%s(%x)\n", __func__, iexp);
 
         sn.info = PRIMASK;
-        sn.r.n = glptr = NULL;
+        sn.r.n = sn.a.n = glptr = NULL;
         xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP | iexp;
 
         while (!((tc = next_token(xtc)) & iexp)) {
@@ -1291,6 +1294,7 @@ static node *parse_expr(uint32_t iexp)
                             || ((t_info == vn->info) && ((t_info & OPCLSMASK) == OC_COLON))
                         ) {
                                 vn = vn->a.n;
+                                if (!vn->a.n) syntax_error(EMSG_UNEXP_TOKEN);
                         }
                         if ((t_info & OPCLSMASK) == OC_TERNARY)
                                 t_info += P(6);
@@ -1429,7 +1433,11 @@ static void chain_expr(uint32_t info)
         node *n;
 
         n = chain_node(info);
+
         n->l.n = parse_expr(TC_OPTERM | TC_GRPTERM);
+        if ((info & OF_REQUIRED) && !n->l.n)
+                syntax_error(EMSG_TOO_FEW_ARGS);
+
         if (t_tclass & TC_GRPTERM)
                 rollback_token();
 }
@@ -1609,12 +1617,25 @@ static void parse_program(char *p)
                         f = newfunc(t_string);
                         f->body.first = NULL;
                         f->nargs = 0;
-                        while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) {
+                        /* Match func arg list: a comma sep list of >= 0 args, and a close paren */
+                        while (next_token(TC_VARIABLE | TC_SEQTERM | TC_COMMA)) {
+                                /* Either an empty arg list, or trailing comma from prev iter
+                                 * must be followed by an arg */
+                                if (f->nargs == 0 && t_tclass == TC_SEQTERM)
+                                        break;
+
+                                /* TC_SEQSTART/TC_COMMA must be followed by TC_VARIABLE */
+                                if (t_tclass != TC_VARIABLE)
+                                        syntax_error(EMSG_UNEXP_TOKEN);
+
                                 v = findvar(ahash, t_string);
                                 v->x.aidx = f->nargs++;
 
+                                /* Arg followed either by end of arg list or 1 comma */
                                 if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
                                         break;
+                                if (t_tclass != TC_COMMA)
+                                        syntax_error(EMSG_UNEXP_TOKEN);
                         }
                         seq = &f->body;
                         chain_group();
diff --git a/editors/sed.c b/editors/sed.c
index fd56e0e7f..a5cedbd8d 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -377,25 +377,25 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
 /* Grab a filename.  Whitespace at start is skipped, then goes to EOL. */
 static int parse_file_cmd(/*sed_cmd_t *sed_cmd,*/ const char *filecmdstr, char **retval)
 {
-        int start = 0, idx, hack = 0;
+        const char *start;
+        const char *eol;
 
         /* Skip whitespace, then grab filename to end of line */
-        while (isspace(filecmdstr[start]))
-                start++;
-        idx = start;
-        while (filecmdstr[idx] && filecmdstr[idx] != '\n')
-                idx++;
-
-        /* If lines glued together, put backslash back. */
-        if (filecmdstr[idx] == '\n')
-                hack = 1;
-        if (idx == start)
+        start = skip_whitespace(filecmdstr);
+        eol = strchrnul(start, '\n');
+        if (eol == start)
                 bb_error_msg_and_die("empty filename");
-        *retval = xstrndup(filecmdstr+start, idx-start+hack+1);
-        if (hack)
-                (*retval)[idx] = '\\';
 
-        return idx;
+        if (*eol) {
+                /* If lines glued together, put backslash back. */
+                *retval = xstrndup(start, eol-start + 1);
+                (*retval)[eol-start] = '\\';
+        } else {
+                /* eol is NUL */
+                *retval = xstrdup(start);
+        }
+
+        return eol - filecmdstr;
 }
 
 static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
diff --git a/editors/vi.c b/editors/vi.c
index 3c758cca0..a46339813 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -600,6 +600,7 @@ static void check_context(char);	// remember context for '' command
 #if ENABLE_FEATURE_VI_UNDO
 static void flush_undo_data(void);
 static void undo_push(char *, unsigned int, unsigned char);     // Push an operation on the undo stack
+static void undo_push_insert(char *, int, int); // convenience function
 static void undo_pop(void);     // Undo the last operation
 # if ENABLE_FEATURE_VI_UNDO_QUEUE
 static void undo_queue_commit(void);    // Flush any queued objects to the undo stack
@@ -2013,19 +2014,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                 c = get_one_char();
                 *p = c;
 #if ENABLE_FEATURE_VI_UNDO
-                switch (undo) {
-                        case ALLOW_UNDO:
-                                undo_push(p, 1, UNDO_INS);
-                                break;
-                        case ALLOW_UNDO_CHAIN:
-                                undo_push(p, 1, UNDO_INS_CHAIN);
-                                break;
-# if ENABLE_FEATURE_VI_UNDO_QUEUE
-                        case ALLOW_UNDO_QUEUED:
-                                undo_push(p, 1, UNDO_INS_QUEUED);
-                                break;
-# endif
-                }
+                undo_push_insert(p, 1, undo);
 #else
                 modified_count++;
 #endif /* ENABLE_FEATURE_VI_UNDO */
@@ -2053,19 +2042,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                 if (c == '\n')
                         undo_queue_commit();
 # endif
-                switch (undo) {
-                        case ALLOW_UNDO:
-                                undo_push(p, 1, UNDO_INS);
-                                break;
-                        case ALLOW_UNDO_CHAIN:
-                                undo_push(p, 1, UNDO_INS_CHAIN);
-                                break;
-# if ENABLE_FEATURE_VI_UNDO_QUEUE
-                        case ALLOW_UNDO_QUEUED:
-                                undo_push(p, 1, UNDO_INS_QUEUED);
-                                break;
-# endif
-                }
+                undo_push_insert(p, 1, undo);
 #else
                 modified_count++;
 #endif /* ENABLE_FEATURE_VI_UNDO */
@@ -2085,7 +2062,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                                 p += bias;
                                 q += bias;
 #if ENABLE_FEATURE_VI_UNDO
-                                undo_push(p, len, UNDO_INS);
+                                undo_push_insert(p, len, undo);
 #endif
                                 memcpy(p, q, len);
                                 p += len;
@@ -2339,16 +2316,18 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type)	// Add to
                 }
                 break;
         case UNDO_INS_QUEUED:
-                if (length != 1)
+                if (length < 1)
                         return;
                 switch (undo_queue_state) {
                 case UNDO_EMPTY:
                         undo_queue_state = UNDO_INS;
                         undo_queue_spos = src;
                 case UNDO_INS:
-                        undo_q++;       // Don't need to save any data for insertions
-                        if (undo_q == CONFIG_FEATURE_VI_UNDO_QUEUE_MAX)
-                                undo_queue_commit();
+                        while (length--) {
+                                undo_q++;       // Don't need to save any data for insertions
+                                if (undo_q == CONFIG_FEATURE_VI_UNDO_QUEUE_MAX)
+                                        undo_queue_commit();
+                        }
                         return;
                 case UNDO_DEL:
                         // Switch from storing deleted text to inserted text
@@ -2394,6 +2373,23 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type)	// Add to
         modified_count++;
 }
 
+static void undo_push_insert(char *p, int len, int undo)
+{
+        switch (undo) {
+        case ALLOW_UNDO:
+                undo_push(p, len, UNDO_INS);
+                break;
+        case ALLOW_UNDO_CHAIN:
+                undo_push(p, len, UNDO_INS_CHAIN);
+                break;
+# if ENABLE_FEATURE_VI_UNDO_QUEUE
+        case ALLOW_UNDO_QUEUED:
+                undo_push(p, len, UNDO_INS_QUEUED);
+                break;
+# endif
+        }
+}
+
 static void undo_pop(void)      // Undo the last operation
 {
         int repeat;
@@ -2667,14 +2663,7 @@ static uintptr_t string_insert(char *p, const char *s, int undo) // insert the s
 
         i = strlen(s);
 #if ENABLE_FEATURE_VI_UNDO
-        switch (undo) {
-                case ALLOW_UNDO:
-                        undo_push(p, i, UNDO_INS);
-                        break;
-                case ALLOW_UNDO_CHAIN:
-                        undo_push(p, i, UNDO_INS_CHAIN);
-                        break;
-        }
+        undo_push_insert(p, i, undo);
 #endif
         bias = text_hole_make(p, i);
         p += bias;
@@ -4263,14 +4252,9 @@ static void do_cmd(int c)
         case 'r':                       // r- replace the current char with user input
                 c1 = get_one_char();    // get the replacement char
                 if (*dot != '\n') {
-#if ENABLE_FEATURE_VI_UNDO
-                        undo_push(dot, 1, UNDO_DEL);
-                        *dot = c1;
-                        undo_push(dot, 1, UNDO_INS_CHAIN);
-#else
-                        *dot = c1;
-                        modified_count++;
-#endif
+                        dot = text_hole_delete(dot, dot, ALLOW_UNDO);
+                        dot = char_insert(dot, c1, ALLOW_UNDO_CHAIN);
+                        dot_left();
                 }
                 end_cmd_q();    // stop adding to q
                 break;