Merge remote branch 'origin/master'

1 files changed, 189 insertions, 199 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 6d67a1f8a..0ff5adb04 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -88,7 +88,7 @@
 //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh))
 //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash))
 
-//kbuild:lib-$(CONFIG_ASH)      += ash.o ash_ptr_hack.o shell_common.o
+//kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
 //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
 
 //config:config ASH
@@ -1002,7 +1002,8 @@ sharg(union node *arg, FILE *fp)
         for (p = arg->narg.text; *p; p++) {
                 switch ((unsigned char)*p) {
                 case CTLESC:
-                        putc(*++p, fp);
+                        p++;
+                        putc(*p, fp);
                         break;
                 case CTLVAR:
                         putc('$', fp);
@@ -1011,8 +1012,10 @@ sharg(union node *arg, FILE *fp)
                         if (subtype == VSLENGTH)
                                 putc('#', fp);
 
-                        while (*p != '=')
-                                putc(*p++, fp);
+                        while (*p != '=') {
+                                putc(*p, fp);
+                                p++;
+                        }
 
                         if (subtype & VSNUL)
                                 putc(':', fp);
@@ -2031,10 +2034,6 @@ extern struct globals_var *const ash_ptr_to_globals_var;
 # define optindval()    (voptind.var_text + 7)
 #endif
 
-
-#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-
 #if ENABLE_ASH_GETOPTS
 static void FAST_FUNC
 getoptsreset(const char *value)
@@ -2044,24 +2043,26 @@ getoptsreset(const char *value)
 }
 #endif
 
+/* math.h has these, otherwise define our private copies */
+#if !ENABLE_SH_MATH_SUPPORT
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
 /*
- * Return of a legal variable name (a letter or underscore followed by zero or
- * more letters, underscores, and digits).
+ * Return the pointer to the first char which is not part of a legal variable name
+ * (a letter or underscore followed by letters, underscores, and digits).
  */
-static char* FAST_FUNC
+static const char*
 endofname(const char *name)
 {
-        char *p;
-
-        p = (char *) name;
-        if (!is_name(*p))
-                return p;
-        while (*++p) {
-                if (!is_in_name(*p))
+        if (!is_name(*name))
+                return name;
+        while (*++name) {
+                if (!is_in_name(*name))
                         break;
         }
-        return p;
+        return name;
 }
+#endif
 
 /*
  * Compares two strings up to the first = or '\0'.  The first
@@ -2244,9 +2245,10 @@ setvareq(char *s, int flags)
 static void
 setvar(const char *name, const char *val, int flags)
 {
-        char *p, *q;
-        size_t namelen;
+        const char *q;
+        char *p;
         char *nameeq;
+        size_t namelen;
         size_t vallen;
 
         q = endofname(name);
@@ -2260,12 +2262,13 @@ setvar(const char *name, const char *val, int flags)
         } else {
                 vallen = strlen(val);
         }
+
         INT_OFF;
         nameeq = ckmalloc(namelen + vallen + 2);
-        p = (char *)memcpy(nameeq, name, namelen) + namelen;
+        p = memcpy(nameeq, name, namelen) + namelen;
         if (val) {
                 *p++ = '=';
-                p = (char *)memcpy(p, val, vallen) + vallen;
+                p = memcpy(p, val, vallen) + vallen;
         }
         *p = '\0';
         setvareq(nameeq, flags | VNOSAVE);
@@ -2491,12 +2494,13 @@ static const char *expandstr(const char *ps);
 #endif
 
 static void
-setprompt(int whichprompt)
+setprompt_if(smallint do_set, int whichprompt)
 {
         const char *prompt;
-#if ENABLE_ASH_EXPAND_PRMT
-        struct stackmark smark;
-#endif
+        IF_ASH_EXPAND_PRMT(struct stackmark smark;)
+
+        if (!do_set)
+                return;
 
         needprompt = 0;
 
@@ -5734,7 +5738,7 @@ ash_arith(const char *s)
 
         math_hooks.lookupvar = lookupvar;
         math_hooks.setvar    = setvar2;
-        math_hooks.endofname = endofname;
+        //math_hooks.endofname = endofname;
 
         INT_OFF;
         result = arith(s, &errcode, &math_hooks);
@@ -6326,7 +6330,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                 flags &= ~EXP_TILDE;
  tilde:
                 q = p;
-                if (*q == CTLESC && (flags & EXP_QWORD))
+                if ((unsigned char)*q == CTLESC && (flags & EXP_QWORD))
                         q++;
                 if (*q == '~')
                         p = exptilde(p, q, flags);
@@ -6340,9 +6344,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                 c = p[length];
                 if (c) {
                         if (!(c & 0x80)
-#if ENABLE_SH_MATH_SUPPORT
-                         || c == CTLENDARI
-#endif
+                        IF_SH_MATH_SUPPORT(|| c == CTLENDARI)
                         ) {
                                 /* c == '=' || c == ':' || c == CTLENDARI */
                                 length++;
@@ -6389,8 +6391,8 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                         /* "$@" syntax adherence hack */
                         if (!inquotes
                          && memcmp(p, dolatstr, 4) == 0
-                         && (  p[4] == CTLQUOTEMARK
-                            || (p[4] == CTLENDVAR && p[5] == CTLQUOTEMARK)
+                         && (  p[4] == (char)CTLQUOTEMARK
+                            || (p[4] == (char)CTLENDVAR && p[5] == (char)CTLQUOTEMARK)
                             )
                         ) {
                                 p = evalvar(p + 1, flags, /* var_str_list: */ NULL) + 1;
@@ -6425,8 +6427,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
 #endif
                 }
         }
- breakloop:
-        ;
+ breakloop: ;
 }
 
 static char *
@@ -6611,8 +6612,8 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
         int zero;
         char *(*scan)(char*, char*, char*, char*, int, int);
 
-        //bb_error_msg("subevalvar(p:'%s',varname:'%s',strloc:%d,subtype:%d,startloc:%d,varflags:%x,quotes:%d",
-        //                      p, varname, strloc, subtype, startloc, varflags, quotes);
+        //bb_error_msg("subevalvar(p:'%s',varname:'%s',strloc:%d,subtype:%d,startloc:%d,varflags:%x,quotes:%d)",
+        //              p, varname, strloc, subtype, startloc, varflags, quotes);
 
         herefd = -1;
         argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0,
@@ -7045,8 +7046,8 @@ evalvar(char *p, int flags, struct strlist *var_str_list)
  vsplus:
                 if (varlen < 0) {
                         argstr(
-                                p, flags | EXP_TILDE |
-                                        (quoted ? EXP_QWORD : EXP_WORD),
+                                p,
+                                flags | (quoted ? EXP_TILDE|EXP_QWORD : EXP_TILDE|EXP_WORD),
                                 var_str_list
                         );
                         goto end;
@@ -9870,7 +9871,7 @@ evalbltin(const struct builtincmd *cmd, int argc, char **argv)
 static int
 goodname(const char *p)
 {
-        return !*endofname(p);
+        return endofname(p)[0] == '\0';
 }
 
 
@@ -11501,7 +11502,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         startlinno = g_parsefile->linno;
         bqlist = NULL;
         quotef = 0;
-        oldstyle = 0;
         prevsyntax = 0;
 #if ENABLE_ASH_EXPAND_PRMT
         pssyntax = (syntax == PSSYNTAX);
@@ -11517,159 +11517,156 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         STARTSTACKSTR(out);
  loop:
         /* For each line, until end of word */
-        {
-                CHECKEND();     /* set c to PEOF if at end of here document */
-                for (;;) {      /* until end of line or end of word */
-                        CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
-                        switch (SIT(c, syntax)) {
-                        case CNL:       /* '\n' */
-                                if (syntax == BASESYNTAX)
-                                        goto endword;   /* exit outer loop */
-                                USTPUTC(c, out);
-                                g_parsefile->linno++;
-                                if (doprompt)
-                                        setprompt(2);
-                                c = pgetc();
-                                goto loop;              /* continue outer loop */
-                        case CWORD:
-                                USTPUTC(c, out);
-                                break;
-                        case CCTL:
-                                if (eofmark == NULL || dblquote)
-                                        USTPUTC(CTLESC, out);
+        CHECKEND();     /* set c to PEOF if at end of here document */
+        for (;;) {      /* until end of line or end of word */
+                CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
+                switch (SIT(c, syntax)) {
+                case CNL:       /* '\n' */
+                        if (syntax == BASESYNTAX)
+                                goto endword;   /* exit outer loop */
+                        USTPUTC(c, out);
+                        g_parsefile->linno++;
+                        setprompt_if(doprompt, 2);
+                        c = pgetc();
+                        goto loop;              /* continue outer loop */
+                case CWORD:
+                        USTPUTC(c, out);
+                        break;
+                case CCTL:
+                        if (eofmark == NULL || dblquote)
+                                USTPUTC(CTLESC, out);
 #if ENABLE_ASH_BASH_COMPAT
-                                if (c == '\\' && bash_dollar_squote) {
-                                        c = decode_dollar_squote();
-                                        if (c & 0x100) {
-                                                USTPUTC('\\', out);
-                                                c = (unsigned char)c;
-                                        }
+                        if (c == '\\' && bash_dollar_squote) {
+                                c = decode_dollar_squote();
+                                if (c & 0x100) {
+                                        USTPUTC('\\', out);
+                                        c = (unsigned char)c;
                                 }
+                        }
 #endif
-                                USTPUTC(c, out);
-                                break;
-                        case CBACK:     /* backslash */
-                                c = pgetc_without_PEOA();
-                                if (c == PEOF) {
+                        USTPUTC(c, out);
+                        break;
+                case CBACK:     /* backslash */
+                        c = pgetc_without_PEOA();
+                        if (c == PEOF) {
+                                USTPUTC(CTLESC, out);
+                                USTPUTC('\\', out);
+                                pungetc();
+                        } else if (c == '\n') {
+                                setprompt_if(doprompt, 2);
+                        } else {
+#if ENABLE_ASH_EXPAND_PRMT
+                                if (c == '$' && pssyntax) {
                                         USTPUTC(CTLESC, out);
                                         USTPUTC('\\', out);
-                                        pungetc();
-                                } else if (c == '\n') {
-                                        if (doprompt)
-                                                setprompt(2);
-                                } else {
-#if ENABLE_ASH_EXPAND_PRMT
-                                        if (c == '$' && pssyntax) {
-                                                USTPUTC(CTLESC, out);
-                                                USTPUTC('\\', out);
-                                        }
+                                }
 #endif
-                                        /* Backslash is retained if we are in "str" and next char isn't special */
-                                        if (dblquote
-                                         && c != '\\'
-                                         && c != '`'
-                                         && c != '$'
-                                         && (c != '"' || eofmark != NULL)
-                                        ) {
-                                                USTPUTC(CTLESC, out);
-                                                USTPUTC('\\', out);
-                                        }
-                                        if (SIT(c, SQSYNTAX) == CCTL)
-                                                USTPUTC(CTLESC, out);
-                                        USTPUTC(c, out);
-                                        quotef = 1;
+                                /* Backslash is retained if we are in "str" and next char isn't special */
+                                if (dblquote
+                                 && c != '\\'
+                                 && c != '`'
+                                 && c != '$'
+                                 && (c != '"' || eofmark != NULL)
+                                ) {
+                                        USTPUTC(CTLESC, out);
+                                        USTPUTC('\\', out);
                                 }
-                                break;
-                        case CSQUOTE:
-                                syntax = SQSYNTAX;
+                                if (SIT(c, SQSYNTAX) == CCTL)
+                                        USTPUTC(CTLESC, out);
+                                USTPUTC(c, out);
+                                quotef = 1;
+                        }
+                        break;
+                case CSQUOTE:
+                        syntax = SQSYNTAX;
  quotemark:
-                                if (eofmark == NULL) {
-                                        USTPUTC(CTLQUOTEMARK, out);
+                        if (eofmark == NULL) {
+                                USTPUTC(CTLQUOTEMARK, out);
+                        }
+                        break;
+                case CDQUOTE:
+                        syntax = DQSYNTAX;
+                        dblquote = 1;
+                        goto quotemark;
+                case CENDQUOTE:
+                        IF_ASH_BASH_COMPAT(bash_dollar_squote = 0;)
+                        if (eofmark != NULL && arinest == 0
+                         && varnest == 0
+                        ) {
+                                USTPUTC(c, out);
+                        } else {
+                                if (dqvarnest == 0) {
+                                        syntax = BASESYNTAX;
+                                        dblquote = 0;
                                 }
-                                break;
-                        case CDQUOTE:
-                                syntax = DQSYNTAX;
-                                dblquote = 1;
+                                quotef = 1;
                                 goto quotemark;
-                        case CENDQUOTE:
-                                IF_ASH_BASH_COMPAT(bash_dollar_squote = 0;)
-                                if (eofmark != NULL && arinest == 0
-                                 && varnest == 0
-                                ) {
-                                        USTPUTC(c, out);
-                                } else {
-                                        if (dqvarnest == 0) {
-                                                syntax = BASESYNTAX;
-                                                dblquote = 0;
-                                        }
-                                        quotef = 1;
-                                        goto quotemark;
-                                }
-                                break;
-                        case CVAR:      /* '$' */
-                                PARSESUB();             /* parse substitution */
-                                break;
-                        case CENDVAR:   /* '}' */
-                                if (varnest > 0) {
-                                        varnest--;
-                                        if (dqvarnest > 0) {
-                                                dqvarnest--;
-                                        }
-                                        c = CTLENDVAR;
+                        }
+                        break;
+                case CVAR:      /* '$' */
+                        PARSESUB();             /* parse substitution */
+                        break;
+                case CENDVAR:   /* '}' */
+                        if (varnest > 0) {
+                                varnest--;
+                                if (dqvarnest > 0) {
+                                        dqvarnest--;
                                 }
-                                USTPUTC(c, out);
-                                break;
+                                c = CTLENDVAR;
+                        }
+                        USTPUTC(c, out);
+                        break;
 #if ENABLE_SH_MATH_SUPPORT
-                        case CLP:       /* '(' in arithmetic */
-                                parenlevel++;
-                                USTPUTC(c, out);
-                                break;
-                        case CRP:       /* ')' in arithmetic */
-                                if (parenlevel > 0) {
-                                        parenlevel--;
-                                } else {
-                                        if (pgetc() == ')') {
-                                                if (--arinest == 0) {
-                                                        syntax = prevsyntax;
-                                                        dblquote = (syntax == DQSYNTAX);
-                                                        c = CTLENDARI;
-                                                }
-                                        } else {
-                                                /*
-                                                 * unbalanced parens
-                                                 * (don't 2nd guess - no error)
-                                                 */
-                                                pungetc();
+                case CLP:       /* '(' in arithmetic */
+                        parenlevel++;
+                        USTPUTC(c, out);
+                        break;
+                case CRP:       /* ')' in arithmetic */
+                        if (parenlevel > 0) {
+                                parenlevel--;
+                        } else {
+                                if (pgetc() == ')') {
+                                        if (--arinest == 0) {
+                                                syntax = prevsyntax;
+                                                dblquote = (syntax == DQSYNTAX);
+                                                c = CTLENDARI;
                                         }
+                                } else {
+                                        /*
+                                         * unbalanced parens
+                                         * (don't 2nd guess - no error)
+                                         */
+                                        pungetc();
                                 }
-                                USTPUTC(c, out);
-                                break;
+                        }
+                        USTPUTC(c, out);
+                        break;
 #endif
-                        case CBQUOTE:   /* '`' */
-                                PARSEBACKQOLD();
-                                break;
-                        case CENDFILE:
-                                goto endword;           /* exit outer loop */
-                        case CIGN:
-                                break;
-                        default:
-                                if (varnest == 0) {
+                case CBQUOTE:   /* '`' */
+                        PARSEBACKQOLD();
+                        break;
+                case CENDFILE:
+                        goto endword;           /* exit outer loop */
+                case CIGN:
+                        break;
+                default:
+                        if (varnest == 0) {
 #if ENABLE_ASH_BASH_COMPAT
-                                        if (c == '&') {
-                                                if (pgetc() == '>')
-                                                        c = 0x100 + '>'; /* flag &> */
-                                                pungetc();
-                                        }
-#endif
-                                        goto endword;   /* exit outer loop */
+                                if (c == '&') {
+                                        if (pgetc() == '>')
+                                                c = 0x100 + '>'; /* flag &> */
+                                        pungetc();
                                 }
-                                IF_ASH_ALIAS(if (c != PEOA))
-                                        USTPUTC(c, out);
+#endif
+                                goto endword;   /* exit outer loop */
                         }
-                        c = pgetc_fast();
-                } /* for (;;) */
-        }
+                        IF_ASH_ALIAS(if (c != PEOA))
+                                USTPUTC(c, out);
+                }
+                c = pgetc_fast();
+        } /* for (;;) */
  endword:
+
 #if ENABLE_SH_MATH_SUPPORT
         if (syntax == ARISYNTAX)
                 raise_error_syntax("missing '))'");
@@ -11907,6 +11904,8 @@ parsesub: {
                                 c = pgetc();
 #if ENABLE_ASH_BASH_COMPAT
                                 if (c == ':' || c == '$' || isdigit(c)) {
+//TODO: support more general format ${v:EXPR:EXPR},
+// where EXPR follows $(()) rules
                                         subtype = VSSUBSTR;
                                         pungetc();
                                         break; /* "goto do_pungetc" is bigger (!) */
@@ -11934,6 +11933,9 @@ parsesub: {
                         }
 #if ENABLE_ASH_BASH_COMPAT
                         case '/':
+                                /* ${v/[/]pattern/repl} */
+//TODO: encode pattern and repl separately.
+// Currently ${v/$var_with_slash/repl} is horribly broken
                                 subtype = VSREPLACE;
                                 c = pgetc();
                                 if (c != '/')
@@ -12000,16 +12002,14 @@ parsebackq: {
                    treatment to some slashes, and then push the string and
                    reread it as input, interpreting it normally.  */
                 char *pout;
-                int pc;
                 size_t psavelen;
                 char *pstr;
 
-
                 STARTSTACKSTR(pout);
                 for (;;) {
-                        if (needprompt) {
-                                setprompt(2);
-                        }
+                        int pc;
+
+                        setprompt_if(needprompt, 2);
                         pc = pgetc();
                         switch (pc) {
                         case '`':
@@ -12019,8 +12019,7 @@ parsebackq: {
                                 pc = pgetc();
                                 if (pc == '\n') {
                                         g_parsefile->linno++;
-                                        if (doprompt)
-                                                setprompt(2);
+                                        setprompt_if(doprompt, 2);
                                         /*
                                          * If eating a newline, avoid putting
                                          * the newline into the new character
@@ -12183,9 +12182,7 @@ xxreadtoken(void)
                 tokpushback = 0;
                 return lasttoken;
         }
-        if (needprompt) {
-                setprompt(2);
-        }
+        setprompt_if(needprompt, 2);
         startlinno = g_parsefile->linno;
         for (;;) {                      /* until token or start of word found */
                 c = pgetc_fast();
@@ -12202,8 +12199,7 @@ xxreadtoken(void)
                                 break; /* return readtoken1(...) */
                         }
                         startlinno = ++g_parsefile->linno;
-                        if (doprompt)
-                                setprompt(2);
+                        setprompt_if(doprompt, 2);
                 } else {
                         const char *p;
 
@@ -12249,9 +12245,7 @@ xxreadtoken(void)
                 tokpushback = 0;
                 return lasttoken;
         }
-        if (needprompt) {
-                setprompt(2);
-        }
+        setprompt_if(needprompt, 2);
         startlinno = g_parsefile->linno;
         for (;;) {      /* until token or start of word found */
                 c = pgetc_fast();
@@ -12267,8 +12261,7 @@ xxreadtoken(void)
                 case '\\':
                         if (pgetc() == '\n') {
                                 startlinno = ++g_parsefile->linno;
-                                if (doprompt)
-                                        setprompt(2);
+                                setprompt_if(doprompt, 2);
                                 continue;
                         }
                         pungetc();
@@ -12394,8 +12387,7 @@ parsecmd(int interact)
 
         tokpushback = 0;
         doprompt = interact;
-        if (doprompt)
-                setprompt(doprompt);
+        setprompt_if(doprompt, doprompt);
         needprompt = 0;
         t = readtoken();
         if (t == TEOF)
@@ -12419,10 +12411,8 @@ parseheredoc(void)
         heredoclist = NULL;
 
         while (here) {
-                if (needprompt) {
-                        setprompt(2);
-                }
-                readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX,
+                setprompt_if(needprompt, 2);
+                readtoken1(pgetc(), here->here->type == NHERE ? SQSYNTAX : DQSYNTAX,
                                 here->eofmark, here->striptabs);
                 n = stzalloc(sizeof(struct narg));
                 n->narg.type = NARG;