Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/shell/ash.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/shell/ash.c (modified) (169 diffs)

branches/3.3/mindi-busybox/shell/ash.c

@@ -38 +38 @@
 #define JOBS ENABLE_ASH_JOB_CONTROL
 
-#include <paths.h>
 #include <setjmp.h>
 #include <fnmatch.h>
 #include <sys/times.h>
+#include <sys/utsname.h> /* for setting $HOSTNAME */
 
 #include "busybox.h" /* for applet_names */
@@ -143 +143 @@
 //config:     Enable support for test builtin in ash.
 //config:
+//config:config ASH_HELP
+//config:   bool "help builtin"
+//config:   default y
+//config:   depends on ASH
+//config:   help
+//config:     Enable help builtin in ash.
+//config:
 //config:config ASH_CMDCMD
 //config:   bool "'command' command to override shell builtins"
@@ -386 +393 @@
 #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
 
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
+
 static int isdigit_str9(const char *str)
 {
@@ -527 +537 @@
 }
 
+/* Was called outcslow(c,FILE*), but c was always '\n' */
 static void
-outcslow(int c, FILE *dest)
+newline_and_flush(FILE *dest)
 {
     INT_OFF;
-    putc(c, dest);
+    putc('\n', dest);
     fflush(dest);
     INT_ON;
@@ -588 +599 @@
 #define CTLENDVAR    ((unsigned char)'\203')
 #define CTLBACKQ     ((unsigned char)'\204')
-#define CTLQUOTE 01             /* ored with CTLBACKQ code if in quotes */
-/*      CTLBACKQ | CTLQUOTE == '\205' */
 #define CTLARI       ((unsigned char)'\206')    /* arithmetic expression */
 #define CTLENDARI    ((unsigned char)'\207')
@@ -598 +607 @@
 #define VSTYPE  0x0f            /* type of variable substitution */
 #define VSNUL   0x10            /* colon--treat the empty string as unset */
-#define VSQUOTE 0x80            /* inside double quotes--suppress splitting */
 
 /* values of VSTYPE field */
@@ -618 +626 @@
 
 static const char dolatstr[] ALIGN1 = {
-    CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'
+    CTLQUOTEMARK, CTLVAR, VSNORMAL, '@', '=', CTLQUOTEMARK, '\0'
 };
+#define DOLATSTRLEN 6
 
 #define NCMD      0
@@ -855 +864 @@
         case CTLESC: c = 'e'; goto backslash;
         case CTLVAR: c = 'v'; goto backslash;
-        case CTLVAR+CTLQUOTE: c = 'V'; goto backslash;
         case CTLBACKQ: c = 'q'; goto backslash;
-        case CTLBACKQ+CTLQUOTE: c = 'Q'; goto backslash;
  backslash:
             putc('\\', tracefile);
@@ -1020 +1027 @@
             break;
         case CTLBACKQ:
-        case CTLBACKQ|CTLQUOTE:
             putc('$', fp);
             putc('(', fp);
@@ -1197 +1203 @@
     }
     vfprintf(stderr, msg, ap);
-    outcslow('\n', stderr);
+    newline_and_flush(stderr);
 }
 
@@ -2009 +2015 @@
 #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 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 const char*
-endofname(const char *name)
-{
-    if (!is_name(*name))
-        return name;
-    while (*++name) {
-        if (!is_in_name(*name))
-            break;
-    }
-    return name;
-}
-#endif
-
 /*
  * Compares two strings up to the first = or '\0'.  The first
@@ -2041 +2026 @@
 
     while ((c = *p) == (d = *q)) {
-        if (!c || c == '=')
+        if (c == '\0' || c == '=')
             goto out;
         p++;
@@ -2139 +2124 @@
 }
 
+static void reinit_unicode_for_ash(void)
+{
+    /* Unicode support should be activated even if LANG is set
+     * _during_ shell execution, not only if it was set when
+     * shell was started. Therefore, re-check LANG every time:
+     */
+    if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
+     || ENABLE_UNICODE_USING_LOCALE
+    ) {
+        const char *s = lookupvar("LC_ALL");
+        if (!s) s = lookupvar("LC_CTYPE");
+        if (!s) s = lookupvar("LANG");
+        reinit_unicode(s);
+    }
+}
+
 /*
  * Search the environment of a builtin command.
@@ -2242 +2243 @@
 
 static void FAST_FUNC
-setvar2(const char *name, const char *val)
+setvar0(const char *name, const char *val)
 {
     setvar(name, val, 0);
@@ -2305 +2306 @@
             INT_ON;
         } else {
-            setvar(s, 0, 0);
+            setvar0(s, NULL);
             vp->flags &= ~VEXPORT;
         }
@@ -2555 +2556 @@
             USTPUTC('/', new);
         }
-        p = strtok(0, "/");
+        p = strtok(NULL, "/");
     }
     if (new > lim)
@@ -2750 +2751 @@
 # define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8))
 #endif
-static const uint16_t S_I_T[] = {
+static const uint16_t S_I_T[] ALIGN2 = {
 #if ENABLE_ASH_ALIAS
     SIT_ITEM(CSPCL   , CIGN     , CIGN , CIGN   ),    /* 0, PEOA */
@@ -2852 +2853 @@
 #else   /* !USE_SIT_FUNCTION */
 
-static const uint8_t syntax_index_table[] = {
+static const uint8_t syntax_index_table[] ALIGN1 = {
     /* BASESYNTAX_DQSYNTAX_SQSYNTAX_ARISYNTAX */
     /*   0      */ CWORD_CWORD_CWORD_CWORD,
@@ -3336 +3337 @@
 #define SHOW_PIDS       0x02    /* show individual pids, not just one line per job */
 #define SHOW_CHANGED    0x04    /* only jobs whose state has changed */
+#define SHOW_STDERR     0x08    /* print to stderr (else stdout) */
 
 /*
@@ -3642 +3644 @@
     if (is_number(p)) {
         num = atoi(p);
-        if (num < njobs) {
+        if (num <= njobs) {
             jp = jobtab + num - 1;
             if (jp->used)
@@ -3850 +3852 @@
     for (ps = jp->ps + 1; ps < psend; ps++)
         printf(" | %s", ps->ps_cmd);
-    outcslow('\n', stdout);
+    newline_and_flush(stdout);
     flush_stdout_stderr();
 }
@@ -3910 +3912 @@
 
 static int
-sprint_status(char *s, int status, int sigonly)
+sprint_status48(char *s, int status, int sigonly)
 {
     int col;
@@ -3917 +3919 @@
     col = 0;
     if (!WIFEXITED(status)) {
-#if JOBS
-        if (WIFSTOPPED(status))
+        if (JOBS && WIFSTOPPED(status))
             st = WSTOPSIG(status);
         else
-#endif
             st = WTERMSIG(status);
         if (sigonly) {
             if (st == SIGINT || st == SIGPIPE)
                 goto out;
-#if JOBS
-            if (WIFSTOPPED(status))
+            if (JOBS && WIFSTOPPED(status))
                 goto out;
-#endif
         }
         st &= 0x7f;
@@ -3935 +3933 @@
         col = fmtstr(s, 32, strsignal(st));
         if (WCOREDUMP(status)) {
-            col += fmtstr(s + col, 16, " (core dumped)");
+            strcpy(s + col, " (core dumped)");
+            col += sizeof(" (core dumped)")-1;
         }
     } else if (!sigonly) {
         st = WEXITSTATUS(status);
-        if (st)
-            col = fmtstr(s, 16, "Done(%d)", st);
-        else
-            col = fmtstr(s, 16, "Done");
+        col = fmtstr(s, 16, (st ? "Done(%d)" : "Done"), st);
     }
  out:
@@ -3955 +3951 @@
     struct job *jp;
     struct job *thisjob;
-    int state;
 
     TRACE(("dowait(0x%x) called\n", wait_flags));
@@ -3973 +3968 @@
     thisjob = NULL;
     for (jp = curjob; jp; jp = jp->prev_job) {
+        int jobstate;
         struct procstat *ps;
         struct procstat *psend;
         if (jp->state == JOBDONE)
             continue;
-        state = JOBDONE;
+        jobstate = JOBDONE;
         ps = jp->ps;
         psend = ps + jp->nprocs;
@@ -3989 +3985 @@
             }
             if (ps->ps_status == -1)
-                state = JOBRUNNING;
+                jobstate = JOBRUNNING;
 #if JOBS
-            if (state == JOBRUNNING)
+            if (jobstate == JOBRUNNING)
                 continue;
             if (WIFSTOPPED(ps->ps_status)) {
                 jp->stopstatus = ps->ps_status;
-                state = JOBSTOPPED;
+                jobstate = JOBSTOPPED;
             }
 #endif
         } while (++ps < psend);
-        if (thisjob)
-            goto gotjob;
-    }
+        if (!thisjob)
+            continue;
+
+        /* Found the job where one of its processes changed its state.
+         * Is there at least one live and running process in this job? */
+        if (jobstate != JOBRUNNING) {
+            /* No. All live processes in the job are stopped
+             * (JOBSTOPPED) or there are no live processes (JOBDONE)
+             */
+            thisjob->changed = 1;
+            if (thisjob->state != jobstate) {
+                TRACE(("Job %d: changing state from %d to %d\n",
+                    jobno(thisjob), thisjob->state, jobstate));
+                thisjob->state = jobstate;
 #if JOBS
-    if (!WIFSTOPPED(status))
-#endif
+                if (jobstate == JOBSTOPPED)
+                    set_curjob(thisjob, CUR_STOPPED);
+#endif
+            }
+        }
+        goto out;
+    }
+    /* The process wasn't found in job list */
+    if (JOBS && !WIFSTOPPED(status))
         jobless--;
-    goto out;
-
- gotjob:
-    if (state != JOBRUNNING) {
-        thisjob->changed = 1;
-
-        if (thisjob->state != state) {
-            TRACE(("Job %d: changing state from %d to %d\n",
-                jobno(thisjob), thisjob->state, state));
-            thisjob->state = state;
-#if JOBS
-            if (state == JOBSTOPPED) {
-                set_curjob(thisjob, CUR_STOPPED);
-            }
-#endif
-        }
-    }
-
  out:
     INT_ON;
@@ -4031 +4027 @@
         int len;
 
-        len = sprint_status(s, status, 1);
+        len = sprint_status48(s, status, 1);
         if (len) {
             s[len] = '\n';
@@ -4052 +4048 @@
 #if JOBS
 static void
-showjob(FILE *out, struct job *jp, int mode)
+showjob(struct job *jp, int mode)
 {
     struct procstat *ps;
@@ -4058 +4054 @@
     int col;
     int indent_col;
-    char s[80];
+    char s[16 + 16 + 48];
+    FILE *out = (mode & SHOW_STDERR ? stderr : stdout);
 
     ps = jp->ps;
@@ -4088 +4085 @@
         if (jp->state == JOBSTOPPED)
             status = jp->stopstatus;
-        col += sprint_status(s + col, status, 0);
+        col += sprint_status48(s + col, status, 0);
     }
     /* By now, "[JOBID]*  [maybe PID] STATUS" is printed */
@@ -4115 +4112 @@
         );
     } while (++ps != psend);
-    outcslow('\n', out);
+    newline_and_flush(out);
 
     jp->changed = 0;
@@ -4130 +4127 @@
  */
 static void
-showjobs(FILE *out, int mode)
+showjobs(int mode)
 {
     struct job *jp;
@@ -4142 +4139 @@
     for (jp = curjob; jp; jp = jp->prev_job) {
         if (!(mode & SHOW_CHANGED) || jp->changed) {
-            showjob(out, jp, mode);
+            showjob(jp, mode);
         }
     }
@@ -4163 +4160 @@
     if (*argv) {
         do
-            showjob(stdout, getjob(*argv, 0), mode);
+            showjob(getjob(*argv, 0), mode);
         while (*++argv);
     } else {
-        showjobs(stdout, mode);
+        showjobs(mode);
     }
 
@@ -4408 +4405 @@
             else
                 str = "${";
-            if (!(subtype & VSQUOTE) == !(quoted & 1))
-                goto dostr;
-            quoted ^= 1;
-            c = '"';
-            break;
+            goto dostr;
         case CTLENDVAR:
             str = "\"}" + !(quoted & 1);
@@ -4420 +4413 @@
         case CTLBACKQ:
             str = "$(...)";
-            goto dostr;
-        case CTLBACKQ+CTLQUOTE:
-            str = "\"$(...)\"";
             goto dostr;
 #if ENABLE_SH_MATH_SUPPORT
@@ -4758 +4748 @@
          */
         /* Save trap handler strings for trap builtin to print */
-        trap_ptr = memcpy(xmalloc(sizeof(trap)), trap, sizeof(trap));
+        trap_ptr = xmemdup(trap, sizeof(trap));
         /* Fall through into clearing traps */
     }
@@ -5419 +5409 @@
     int i;
 
-    if (--g_nullredirs >= 0)
+    if (--g_nullredirs >= 0 || redirlist == NULL)
         return;
     INT_OFF;
@@ -5500 +5490 @@
 
     math_state.lookupvar = lookupvar;
-    math_state.setvar    = setvar2;
+    math_state.setvar    = setvar0;
     //math_state.endofname = endofname;
 
@@ -5521 +5511 @@
 #define EXP_REDIR       0x8     /* file glob for a redirection (1 match only) */
 #define EXP_CASE        0x10    /* keeps quotes around for CASE pattern */
-#define EXP_RECORD      0x20    /* need to record arguments for ifs breakup */
+#define EXP_QPAT        0x20    /* pattern in quoted parameter expansion */
 #define EXP_VARTILDE2   0x40    /* expand tildes after colons only */
 #define EXP_WORD        0x80    /* expand word in parameter expansion */
-#define EXP_QWORD       0x100   /* expand word in quoted parameter expansion */
+#define EXP_QUOTED      0x100   /* expand word in double quotes */
 /*
  * rmescape() flags
@@ -5530 +5520 @@
 #define RMESCAPE_ALLOC  0x1     /* Allocate a new string */
 #define RMESCAPE_GLOB   0x2     /* Add backslashes for glob */
-#define RMESCAPE_QUOTED 0x4     /* Remove CTLESC unless in quotes */
 #define RMESCAPE_GROW   0x8     /* Grow strings instead of stalloc */
 #define RMESCAPE_HEAP   0x10    /* Malloc strings instead of stalloc */
+#define RMESCAPE_SLASH  0x20    /* Stop globbing after slash */
+
+/* Add CTLESC when necessary. */
+#define QUOTES_ESC     (EXP_FULL | EXP_CASE | EXP_QPAT | EXP_REDIR)
+/* Do not skip NUL characters. */
+#define QUOTES_KEEPNUL EXP_TILDE
 
 /*
@@ -5574 +5569 @@
     int len;
 
-    expdest = makestrspace(32, expdest);
-    len = fmtstr(expdest, 32, ARITH_FMT, num);
+    expdest = makestrspace(sizeof(arith_t)*3 + 2, expdest);
+    len = fmtstr(expdest, sizeof(arith_t)*3 + 2, ARITH_FMT, num);
     STADJUST(len, expdest);
     return len;
@@ -5597 +5592 @@
 rmescapes(char *str, int flag)
 {
-    static const char qchars[] ALIGN1 = { CTLESC, CTLQUOTEMARK, '\0' };
+    static const char qchars[] ALIGN1 = {
+        IF_ASH_BASH_COMPAT('/',) CTLESC, CTLQUOTEMARK, '\0' };
 
     char *p, *q, *r;
@@ -5603 +5599 @@
     unsigned protect_against_glob;
     unsigned globbing;
-
-    p = strpbrk(str, qchars);
+    IF_ASH_BASH_COMPAT(unsigned slash = flag & RMESCAPE_SLASH;)
+
+    p = strpbrk(str, qchars IF_ASH_BASH_COMPAT(+ !slash));
     if (!p)
         return str;
@@ -5631 +5628 @@
     }
 
-    inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
+    inquotes = 0;
     globbing = flag & RMESCAPE_GLOB;
     protect_against_glob = globbing;
     while (*p) {
         if ((unsigned char)*p == CTLQUOTEMARK) {
-// TODO: if no RMESCAPE_QUOTED in flags, inquotes never becomes 0
-// (alternates between RMESCAPE_QUOTED and ~RMESCAPE_QUOTED). Is it ok?
 // Note: both inquotes and protect_against_glob only affect whether
 // CTLESC,<ch> gets converted to <ch> or to \<ch>
@@ -5645 +5640 @@
             continue;
         }
-        if (*p == '\\') {
+        if ((unsigned char)*p == CTLESC) {
+            p++;
+            if (protect_against_glob) {
+                *q++ = '\\';
+            }
+        } else if (*p == '\\' && !inquotes) {
             /* naked back slash */
             protect_against_glob = 0;
             goto copy;
         }
-        if ((unsigned char)*p == CTLESC) {
-            p++;
-            if (protect_against_glob && inquotes && *p != '/') {
-                *q++ = '\\';
-            }
-        }
+#if ENABLE_ASH_BASH_COMPAT
+        else if (*p == '/' && slash) {
+            /* stop handling globbing and mark location of slash */
+            globbing = slash = 0;
+            *p = CTLESC;
+        }
+#endif
         protect_against_glob = globbing;
  copy:
@@ -5675 +5676 @@
  */
 static char *
-preglob(const char *pattern, int quoted, int flag)
-{
-    flag |= RMESCAPE_GLOB;
-    if (quoted) {
-        flag |= RMESCAPE_QUOTED;
-    }
-    return rmescapes((char *)pattern, flag);
+preglob(const char *pattern, int flag)
+{
+    return rmescapes((char *)pattern, flag | RMESCAPE_GLOB);
 }
 
@@ -5690 +5687 @@
 memtodest(const char *p, size_t len, int syntax, int quotes)
 {
-    char *q = expdest;
-
-    q = makestrspace(quotes ? len * 2 : len, q);
-
-    while (len--) {
+    char *q;
+
+    if (!len)
+        return;
+
+    q = makestrspace((quotes & QUOTES_ESC) ? len * 2 : len, expdest);
+
+    do {
         unsigned char c = *p++;
-        if (c == '\0')
+        if (c) {
+            int n = SIT(c, syntax);
+            if ((quotes & QUOTES_ESC) &&
+                    ((n == CCTL) ||
+                    (((quotes & EXP_FULL) || syntax != BASESYNTAX) &&
+                    n == CBACK)))
+                USTPUTC(CTLESC, q);
+        } else if (!(quotes & QUOTES_KEEPNUL))
             continue;
-        if (quotes) {
-            int n = SIT(c, syntax);
-            if (n == CCTL || n == CBACK)
-                USTPUTC(CTLESC, q);
-        }
         USTPUTC(c, q);
-    }
+    } while (--len);
 
     expdest = q;
 }
 
-static void
+static size_t
 strtodest(const char *p, int syntax, int quotes)
 {
-    memtodest(p, strlen(p), syntax, quotes);
+    size_t len = strlen(p);
+    memtodest(p, len, syntax, quotes);
+    return len;
 }
 
@@ -5785 +5789 @@
     struct passwd *pw;
     const char *home;
-    int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
-    int startloc;
+    int quotes = flags & QUOTES_ESC;
 
     name = p + 1;
@@ -5818 +5821 @@
         goto lose;
     *p = c;
-    startloc = expdest - (char *)stackblock();
     strtodest(home, SQSYNTAX, quotes);
-    recordregion(startloc, expdest - (char *)stackblock(), 0);
     return p;
  lose:
@@ -5893 +5894 @@
  */
 static void
-expbackq(union node *cmd, int quoted, int quotes)
+expbackq(union node *cmd, int flag)
 {
     struct backcmd in;
@@ -5901 +5902 @@
     char *dest;
     int startloc;
-    int syntax = quoted ? DQSYNTAX : BASESYNTAX;
+    int syntax = flag & EXP_QUOTED ? DQSYNTAX : BASESYNTAX;
     struct stackmark smark;
 
@@ -5917 +5918 @@
         goto read;
     for (;;) {
-        memtodest(p, i, syntax, quotes);
+        memtodest(p, i, syntax, flag & QUOTES_ESC);
  read:
         if (in.fd < 0)
             break;
-        i = nonblock_immune_read(in.fd, buf, sizeof(buf), /*loop_on_EINTR:*/ 1);
+        i = nonblock_immune_read(in.fd, buf, sizeof(buf));
         TRACE(("expbackq: read returns %d\n", i));
         if (i <= 0)
@@ -5941 +5942 @@
     expdest = dest;
 
-    if (quoted == 0)
+    if (!(flag & EXP_QUOTED))
         recordregion(startloc, dest - (char *)stackblock(), 0);
     TRACE(("evalbackq: size:%d:'%.*s'\n",
@@ -5955 +5956 @@
  */
 static void
-expari(int quotes)
+expari(int flag)
 {
     char *p, *start;
     int begoff;
-    int flag;
     int len;
 
@@ -5997 +5997 @@
     removerecordregions(begoff);
 
-    flag = p[1];
-
     expdest = p;
 
-    if (quotes)
-        rmescapes(p + 2, 0);
-
-    len = cvtnum(ash_arith(p + 2));
-
-    if (flag != '"')
+    if (flag & QUOTES_ESC)
+        rmescapes(p + 1, 0);
+
+    len = cvtnum(ash_arith(p + 1));
+
+    if (!(flag & EXP_QUOTED))
         recordregion(begoff, begoff + len, 0);
 }
@@ -6034 +6032 @@
         CTLVAR,
         CTLBACKQ,
-        CTLBACKQ | CTLQUOTE,
 #if ENABLE_SH_MATH_SUPPORT
         CTLENDARI,
@@ -6041 +6038 @@
     };
     const char *reject = spclchars;
-    int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
-    int breakall = flags & EXP_WORD;
+    int breakall = (flags & (EXP_WORD | EXP_QUOTED)) == EXP_WORD;
     int inquotes;
     size_t length;
@@ -6060 +6056 @@
  tilde:
         q = p;
-        if ((unsigned char)*q == CTLESC && (flags & EXP_QWORD))
-            q++;
         if (*q == '~')
             p = exptilde(p, q, flags);
@@ -6118 +6112 @@
             goto breakloop;
         case CTLQUOTEMARK:
+            inquotes ^= EXP_QUOTED;
             /* "$@" syntax adherence hack */
-            if (!inquotes
-             && memcmp(p, dolatstr, 4) == 0
-             && (  p[4] == (char)CTLQUOTEMARK
-                || (p[4] == (char)CTLENDVAR && p[5] == (char)CTLQUOTEMARK)
-                )
-            ) {
-                p = evalvar(p + 1, flags, /* var_str_list: */ NULL) + 1;
+            if (inquotes && !memcmp(p, dolatstr + 1, DOLATSTRLEN - 1)) {
+                p = evalvar(p + 1, flags | inquotes, /* var_str_list: */ NULL) + 1;
                 goto start;
             }
-            inquotes = !inquotes;
  addquote:
-            if (quotes) {
+            if (flags & QUOTES_ESC) {
                 p--;
                 length++;
@@ -6139 +6128 @@
             startloc++;
             length++;
+
+            /*
+             * Quoted parameter expansion pattern: remove quote
+             * unless inside inner quotes or we have a literal
+             * backslash.
+             */
+            if (((flags | inquotes) & (EXP_QPAT | EXP_QUOTED)) ==
+                EXP_QPAT && *p != '\\')
+                break;
+
             goto addquote;
         case CTLVAR:
             TRACE(("argstr: evalvar('%s')\n", p));
-            p = evalvar(p, flags, var_str_list);
+            p = evalvar(p, flags | inquotes, var_str_list);
             TRACE(("argstr: evalvar:'%s'\n", (char *)stackblock()));
             goto start;
         case CTLBACKQ:
-            c = '\0';
-        case CTLBACKQ|CTLQUOTE:
-            expbackq(argbackq->n, c, quotes);
+            expbackq(argbackq->n, flags | inquotes);
             argbackq = argbackq->next;
             goto start;
@@ -6154 +6151 @@
         case CTLENDARI:
             p--;
-            expari(quotes);
+            expari(flags | inquotes);
             goto start;
 #endif
@@ -6284 +6281 @@
 }
 
-#if ENABLE_ASH_BASH_COMPAT
-static char *
-parse_sub_pattern(char *arg, int varflags)
-{
-    char *idx, *repl = NULL;
-    unsigned char c;
-
-    //char *org_arg = arg;
-    //bb_error_msg("arg:'%s' varflags:%x", arg, varflags);
-    idx = arg;
-    while (1) {
-        c = *arg;
-        if (!c)
-            break;
-        if (c == '/') {
-            /* Only the first '/' seen is our separator */
-            if (!repl) {
-                repl = idx + 1;
-                c = '\0';
-            }
-        }
-        *idx++ = c;
-        arg++;
-        /*
-         * Example: v='ab\c'; echo ${v/\\b/_\\_\z_}
-         * The result is a_\_z_c (not a\_\_z_c)!
-         *
-         * Enable debug prints in this function and you'll see:
-         * ash: arg:'\\b/_\\_z_' varflags:d
-         * ash: pattern:'\\b' repl:'_\_z_'
-         * That is, \\b is interpreted as \\b, but \\_ as \_!
-         * IOW: search pattern and replace string treat backslashes
-         * differently! That is the reason why we check repl below:
-         */
-        if (c == '\\' && *arg == '\\' && repl && !(varflags & VSQUOTE))
-            arg++; /* skip both '\', not just first one */
-    }
-    *idx = c; /* NUL */
-    //bb_error_msg("pattern:'%s' repl:'%s'", org_arg, repl);
-
-    return repl;
-}
-#endif /* ENABLE_ASH_BASH_COMPAT */
-
 static const char *
 subevalvar(char *p, char *varname, int strloc, int subtype,
-        int startloc, int varflags, int quotes, struct strlist *var_str_list)
+        int startloc, int varflags, int flag, struct strlist *var_str_list)
 {
     struct nodelist *saveargbackq = argbackq;
+    int quotes = flag & QUOTES_ESC;
     char *startp;
     char *loc;
     char *rmesc, *rmescend;
     char *str;
-    IF_ASH_BASH_COMPAT(const char *repl = NULL;)
+    IF_ASH_BASH_COMPAT(char *repl = NULL;)
     IF_ASH_BASH_COMPAT(int pos, len, orig_len;)
     int saveherefd = herefd;
@@ -6349 +6303 @@
 
     herefd = -1;
-    argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0,
+    argstr(p, EXP_TILDE | (subtype != VSASSIGN && subtype != VSQUESTION ?
+            (flag & (EXP_QUOTED | EXP_QPAT) ? EXP_QPAT : EXP_CASE) : 0),
             var_str_list);
     STPUTC('\0', expdest);
@@ -6358 +6313 @@
     switch (subtype) {
     case VSASSIGN:
-        setvar(varname, startp, 0);
+        setvar0(varname, startp);
         amount = startp - expdest;
         STADJUST(amount, expdest);
@@ -6406 +6361 @@
             }
         }
-        if (pos >= orig_len) {
+        if (pos < 0) {
+            /* ${VAR:$((-n)):l} starts n chars from the end */
+            pos = orig_len + pos;
+        }
+        if ((unsigned)pos >= orig_len) {
+            /* apart from obvious ${VAR:999999:l},
+             * covers ${VAR:$((-9999999)):l} - result is ""
+             * (bash-compat)
+             */
             pos = 0;
             len = 0;
@@ -6453 +6416 @@
     rmescend--;
     str = (char *)stackblock() + strloc;
-    preglob(str, varflags & VSQUOTE, 0);
+    /*
+     * Example: v='a\bc'; echo ${v/\\b/_\\_\z_}
+     * The result is a_\_z_c (not a\_\_z_c)!
+     *
+     * The search pattern and replace string treat backslashes differently!
+     * RMESCAPE_SLASH causes preglob to work differently on the pattern
+     * and string.  It's only used on the first call.
+     */
+    preglob(str, IF_ASH_BASH_COMPAT(
+        (subtype == VSREPLACE || subtype == VSREPLACEALL) && !repl ?
+            RMESCAPE_SLASH :) 0);
 
 #if ENABLE_ASH_BASH_COMPAT
@@ -6461 +6434 @@
 
         if (!repl) {
-            repl = parse_sub_pattern(str, varflags);
-            //bb_error_msg("repl:'%s'", repl);
-            if (!repl)
+            if ((repl=strchr(str, CTLESC)))
+                *repl++ = '\0';
+            else
                 repl = nullstr;
         }
+        //bb_error_msg("str:'%s' repl:'%s'", str, repl);
 
         /* If there's no pattern to match, return the expansion unmolested */
@@ -6598 +6572 @@
     int num;
     int i;
-    int sepq = 0;
     ssize_t len = 0;
+    int sep;
+    int quoted = flags & EXP_QUOTED;
     int subtype = varflags & VSTYPE;
-    int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
-    int quoted = varflags & VSQUOTE;
+    int discard = subtype == VSPLUS || subtype == VSLENGTH;
+    int quotes = (discard ? 0 : (flags & QUOTES_ESC)) | QUOTES_KEEPNUL;
     int syntax = quoted ? DQSYNTAX : BASESYNTAX;
+
+    sep = quoted ? ((flags & EXP_FULL) << CHAR_BIT) : 0;
 
     switch (*name) {
@@ -6639 +6616 @@
     case '@': {
         char **ap;
-        int sep;
+        char sepc;
 
         if (quoted && (flags & EXP_FULL)) {
@@ -6649 +6626 @@
     case '*':
         sep = ifsset() ? (unsigned char)(ifsval()[0]) : ' ';
-        i = SIT(sep, syntax);
-        if (quotes && (i == CCTL || i == CBACK))
-            sepq = 1;
  param:
         ap = shellparam.p;
+        sepc = sep;
         if (!ap)
             return -1;
         while ((p = *ap++) != NULL) {
-            size_t partlen;
-
-            partlen = strlen(p);
-            len += partlen;
-
-            if (!(subtype == VSPLUS || subtype == VSLENGTH))
-                memtodest(p, partlen, syntax, quotes);
+            len += strtodest(p, syntax, quotes);
 
             if (*ap && sep) {
-                char *q;
-
                 len++;
-                if (subtype == VSPLUS || subtype == VSLENGTH) {
-                    continue;
-                }
-                q = expdest;
-                if (sepq)
-                    STPUTC(CTLESC, q);
-                /* note: may put NUL despite sep != 0
-                 * (see sep = 1 << CHAR_BIT above) */
-                STPUTC(sep, q);
-                expdest = q;
+                memtodest(&sepc, 1, syntax, quotes);
             }
         }
-        return len;
+        break;
     } /* case '@' and '*' */
     case '0':
@@ -6730 +6688 @@
             return -1;
 
-        len = strlen(p);
-        if (!(subtype == VSPLUS || subtype == VSLENGTH))
-            memtodest(p, len, syntax, quotes);
-        return len;
-    }
-
-    if (subtype == VSPLUS || subtype == VSLENGTH)
+        len = strtodest(p, syntax, quotes);
+#if ENABLE_UNICODE_SUPPORT
+        if (subtype == VSLENGTH && len > 0) {
+            reinit_unicode_for_ash();
+            if (unicode_status == UNICODE_ON) {
+                STADJUST(-len, expdest);
+                discard = 0;
+                len = unicode_strlen(p);
+            }
+        }
+#endif
+        break;
+    }
+
+    if (discard)
         STADJUST(-len, expdest);
     return len;
@@ -6750 +6716 @@
     char varflags;
     char subtype;
-    char quoted;
+    int quoted;
     char easy;
     char *var;
@@ -6759 +6725 @@
     varflags = (unsigned char) *p++;
     subtype = varflags & VSTYPE;
-    quoted = varflags & VSQUOTE;
+    quoted = flags & EXP_QUOTED;
     var = p;
     easy = (!quoted || (*var == '@' && shellparam.nparam));
@@ -6780 +6746 @@
             argstr(
                 p,
-                flags | (quoted ? EXP_TILDE|EXP_QWORD : EXP_TILDE|EXP_WORD),
+                flags | EXP_TILDE | EXP_WORD,
                 var_str_list
             );
@@ -6794 +6760 @@
             if (subevalvar(p, var, /* strloc: */ 0,
                     subtype, startloc, varflags,
-                    /* quotes: */ 0,
+                    /* quotes: */ flags & ~QUOTES_ESC,
                     var_str_list)
             ) {
@@ -6851 +6817 @@
         patloc = expdest - (char *)stackblock();
         if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype,
-                startloc, varflags,
-                /* quotes: */ flags & (EXP_FULL | EXP_CASE | EXP_REDIR),
-                var_str_list)
-        ) {
+                startloc, varflags, flags, var_str_list)) {
             int amount = expdest - (
                 (char *)stackblock() + patloc - 1
@@ -6873 +6836 @@
             if (c == CTLESC)
                 p++;
-            else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) {
+            else if (c == CTLBACKQ) {
                 if (varlen >= 0)
                     argbackq = argbackq->next;
@@ -7028 +6991 @@
     int atend;
     int matchdot;
+    int esc;
 
     metaflag = 0;
     start = name;
-    for (p = name; *p; p++) {
+    for (p = name; esc = 0, *p; p += esc + 1) {
         if (*p == '*' || *p == '?')
             metaflag = 1;
@@ -7048 +7012 @@
                 }
             }
-        } else if (*p == '\\')
-            p++;
-        else if (*p == '/') {
-            if (metaflag)
-                goto out;
-            start = p + 1;
-        }
-    }
- out:
+        } else {
+            if (*p == '\\')
+                esc++;
+            if (p[esc] == '/') {
+                if (metaflag)
+                    break;
+                start = p + esc + 1;
+            }
+        }
+    }
     if (metaflag == 0) {    /* we've reached the end of the file name */
         if (enddir != expdir)
@@ -7096 +7061 @@
     } else {
         atend = 0;
-        *endname++ = '\0';
+        *endname = '\0';
+        endname += esc + 1;
     }
     matchdot = 0;
@@ -7121 +7087 @@
     closedir(dirp);
     if (!atend)
-        endname[-1] = '/';
+        endname[-esc - 1] = esc ? '\\' : '/';
 }
 
@@ -7209 +7175 @@
 
         INT_OFF;
-        p = preglob(str->text, 0, RMESCAPE_ALLOC | RMESCAPE_HEAP);
+        p = preglob(str->text, RMESCAPE_ALLOC | RMESCAPE_HEAP);
         {
             int i = strlen(str->text);
@@ -7299 +7265 @@
 {
     herefd = fd;
-    expandarg(arg, (struct arglist *)NULL, 0);
+    expandarg(arg, (struct arglist *)NULL, EXP_QUOTED);
     full_write(fd, stackblock(), expdest - (char *)stackblock());
 }
@@ -7309 +7275 @@
 patmatch(char *pattern, const char *string)
 {
-    return pmatch(preglob(pattern, 0, 0), string);
+    return pmatch(preglob(pattern, 0), string);
 }
 
@@ -7762 +7728 @@
     builtinloc = idx_bltin;
 }
-
-#define TEOF 0
-#define TNL 1
-#define TREDIR 2
-#define TWORD 3
-#define TSEMI 4
-#define TBACKGND 5
-#define TAND 6
-#define TOR 7
-#define TPIPE 8
-#define TLP 9
-#define TRP 10
-#define TENDCASE 11
-#define TENDBQUOTE 12
-#define TNOT 13
-#define TCASE 14
-#define TDO 15
-#define TDONE 16
-#define TELIF 17
-#define TELSE 18
-#define TESAC 19
-#define TFI 20
-#define TFOR 21
-#define TIF 22
-#define TIN 23
-#define TTHEN 24
-#define TUNTIL 25
-#define TWHILE 26
-#define TBEGIN 27
-#define TEND 28
+enum {
+    TEOF,
+    TNL,
+    TREDIR,
+    TWORD,
+    TSEMI,
+    TBACKGND,
+    TAND,
+    TOR,
+    TPIPE,
+    TLP,
+    TRP,
+    TENDCASE,
+    TENDBQUOTE,
+    TNOT,
+    TCASE,
+    TDO,
+    TDONE,
+    TELIF,
+    TELSE,
+    TESAC,
+    TFI,
+    TFOR,
+#if ENABLE_ASH_BASH_COMPAT
+    TFUNCTION,
+#endif
+    TIF,
+    TIN,
+    TTHEN,
+    TUNTIL,
+    TWHILE,
+    TBEGIN,
+    TEND
+};
 typedef smallint token_id_t;
 
@@ -7820 +7790 @@
     "\1fi",
     "\0for",
+#if ENABLE_ASH_BASH_COMPAT
+    "\0function",
+#endif
     "\0if",
     "\0in",
@@ -7848 +7821 @@
  */
 static int
-describe_command(char *command, int describe_command_verbose)
+describe_command(char *command, const char *path, int describe_command_verbose)
 {
     struct cmdentry entry;
@@ -7855 +7828 @@
     const struct alias *ap;
 #endif
-    const char *path = pathval();
+
+    path = path ? path : pathval();
 
     if (describe_command_verbose) {
@@ -7955 +7929 @@
     }
     while (argv[i]) {
-        err |= describe_command(argv[i++], verbose);
+        err |= describe_command(argv[i++], NULL, verbose);
     }
     return err;
@@ -7969 +7943 @@
         VERIFY_VERBOSE = 2,
     } verify = 0;
+    const char *path = NULL;
 
     while ((c = nextopt("pvV")) != '\0')
@@ -7979 +7954 @@
             abort();
 #endif
+        else
+            path = bb_default_path;
     /* Mimic bash: just "command -v" doesn't complain, it's a nop */
     if (verify && (*argptr != NULL)) {
-        return describe_command(*argptr, verify - VERIFY_BRIEF);
+        return describe_command(*argptr, path, verify - VERIFY_BRIEF);
     }
 
@@ -8001 +7978 @@
 #define EV_BACKCMD 04           /* command executing within back quotes */
 
-static const uint8_t nodesize[N_NUMBER] = {
+static const uint8_t nodesize[N_NUMBER] ALIGN1 = {
     [NCMD     ] = SHELL_ALIGN(sizeof(struct ncmd)),
     [NPIPE    ] = SHELL_ALIGN(sizeof(struct npipe)),
@@ -8454 +8431 @@
             (flags | ((is_or >> 1) - 1)) & EV_TESTED
         );
-        if (!exitstatus == is_or)
+        if ((!exitstatus) == is_or)
             break;
         if (!evalskip) {
@@ -8562 +8539 @@
     arglist.lastp = &arglist.list;
     for (argp = n->nfor.args; argp; argp = argp->narg.next) {
-        expandarg(argp, &arglist, EXP_FULL | EXP_TILDE | EXP_RECORD);
+        expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
         /* XXX */
         if (evalskip)
@@ -8573 +8550 @@
     flags &= EV_TESTED;
     for (sp = arglist.list; sp; sp = sp->next) {
-        setvar(n->nfor.var, sp->text, 0);
+        setvar0(n->nfor.var, sp->text);
         evaltree(n->nfor.body, flags);
         if (evalskip) {
@@ -8798 +8775 @@
             /* note: ash and hush share this string */
             out1fmt("\n\n%s %s\n"
-                "Enter 'help' for a list of built-in commands."
-                "\n\n",
+                IF_ASH_HELP("Enter 'help' for a list of built-in commands.\n")
+                "\n",
                 bb_banner,
                 "built-in shell (ash)"
@@ -8914 +8891 @@
         cp = *++argv;
         if (!cp)
-            return 0;
+            return NULL;
         if (*cp++ != '-')
             break;
@@ -8921 +8898 @@
             break;
         if (c == '-' && !*cp) {
-            argv++;
+            if (!*++argv)
+                return NULL;
             break;
         }
@@ -8931 +8909 @@
             default:
                 /* run 'typecmd' for other options */
-                return 0;
+                return NULL;
             }
             c = *cp++;
@@ -8944 +8922 @@
  * value and flags are saved in a localvar structure.  The saved values
  * will be restored when the shell function returns.  We handle the name
- * "-" as a special case.
+ * "-" as a special case: it makes changes to "set +-options" local
+ * (options will be restored on return from the function).
  */
 static void
@@ -8952 +8931 @@
     struct var **vpp;
     struct var *vp;
+    char *eq = strchr(name, '=');
 
     INT_OFF;
-    lvp = ckzalloc(sizeof(struct localvar));
+    /* Cater for duplicate "local". Examples:
+     * x=0; f() { local x=1; echo $x; local x; echo $x; }; f; echo $x
+     * x=0; f() { local x=1; echo $x; local x=2; echo $x; }; f; echo $x
+     */
+    lvp = localvars;
+    while (lvp) {
+        if (lvp->vp && varcmp(lvp->vp->var_text, name) == 0) {
+            if (eq)
+                setvareq(name, 0);
+            /* else:
+             * it's a duplicate "local VAR" declaration, do nothing
+             */
+            return;
+        }
+        lvp = lvp->next;
+    }
+
+    lvp = ckzalloc(sizeof(*lvp));
     if (LONE_DASH(name)) {
         char *p;
@@ -8961 +8958 @@
         vp = NULL;
     } else {
-        char *eq;
-
         vpp = hashvar(name);
         vp = *findvar(vpp, name);
-        eq = strchr(name, '=');
         if (vp == NULL) {
+            /* variable did not exist yet */
             if (eq)
                 setvareq(name, VSTRFIXED);
@@ -8976 +8971 @@
             lvp->text = vp->var_text;
             lvp->flags = vp->flags;
+            /* make sure neither "struct var" nor string gets freed
+             * during (un)setting:
+             */
             vp->flags |= VSTRFIXED|VTEXTFIXED;
             if (eq)
                 setvareq(name, 0);
+            else
+                /* "local VAR" unsets VAR: */
+                setvar0(name, NULL);
         }
     }
@@ -8994 +8995 @@
 {
     char *name;
+
+    if (!funcnest)
+        ash_msg_and_raise_error("not in a function");
 
     argv = argptr;
@@ -9049 +9053 @@
 static int getoptscmd(int, char **) FAST_FUNC;
 #endif
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+#if ENABLE_ASH_HELP
 static int helpcmd(int, char **) FAST_FUNC;
+#endif
+#if MAX_HISTORY
+static int historycmd(int, char **) FAST_FUNC;
 #endif
 #if ENABLE_SH_MATH_SUPPORT
@@ -9122 +9129 @@
 #endif
     { BUILTIN_NOSPEC        "hash"    , hashcmd    },
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+#if ENABLE_ASH_HELP
     { BUILTIN_NOSPEC        "help"    , helpcmd    },
+#endif
+#if MAX_HISTORY
+    { BUILTIN_NOSPEC        "history" , historycmd },
 #endif
 #if JOBS
@@ -9431 +9441 @@
             int exit_status;
             int i = exception_type;
-            if (i == EXEXIT)
+            if (i == EXEXIT || i == EXEXEC)
                 goto raise;
             exit_status = 2;
@@ -9454 +9464 @@
             goto raise;
         break;
-
     } /* switch */
 
@@ -9464 +9473 @@
          * However I implemented that within libedit itself.
          */
-        setvar("_", lastarg, 0);
+        setvar0("_", lastarg);
     }
     popstackmark(&smark);
@@ -9650 +9659 @@
  retry:
     if (!iflag || g_parsefile->pf_fd != STDIN_FILENO)
-        nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1);
+        nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
     else {
         int timeout = -1;
@@ -9666 +9675 @@
         line_input_state->path_lookup = pathval();
 # endif
-        /* Unicode support should be activated even if LANG is set
-         * _during_ shell execution, not only if it was set when
-         * shell was started. Therefore, re-check LANG every time:
-         */
-        reinit_unicode(lookupvar("LANG"));
+        reinit_unicode_for_ash();
         nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
         if (nr == 0) {
@@ -9689 +9694 @@
 # if ENABLE_ASH_IDLE_TIMEOUT
             else if (errno == EAGAIN && timeout > 0) {
-                printf("\007timed out waiting for input: auto-logout\n");
+                puts("\007timed out waiting for input: auto-logout");
                 exitshell();
             }
@@ -9696 +9701 @@
     }
 #else
-    nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1);
+    nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
 #endif
 
@@ -10041 +10046 @@
 #if ENABLE_ASH_MAIL
 
-#define MAXMBOXES 10
-
-/* times of mailboxes */
-static time_t mailtime[MAXMBOXES];
+/* Hash of mtimes of mailboxes */
+static unsigned mailtime_hash;
 /* Set if MAIL or MAILPATH is changed. */
 static smallint mail_var_path_changed;
@@ -10060 +10063 @@
     char *p;
     char *q;
-    time_t *mtp;
+    unsigned new_hash;
     struct stackmark smark;
     struct stat statb;
@@ -10066 +10069 @@
     setstackmark(&smark);
     mpath = mpathset() ? mpathval() : mailval();
-    for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
+    new_hash = 0;
+    for (;;) {
         p = path_advance(&mpath, nullstr);
         if (p == NULL)
@@ -10080 +10084 @@
         q[-1] = '\0';                   /* delete trailing '/' */
         if (stat(p, &statb) < 0) {
-            *mtp = 0;
             continue;
         }
-        if (!mail_var_path_changed && statb.st_mtime != *mtp) {
-            fprintf(
-                stderr, "%s\n",
-                pathopt ? pathopt : "you have mail"
-            );
-        }
-        *mtp = statb.st_mtime;
+        /* Very simplistic "hash": just a sum of all mtimes */
+        new_hash += (unsigned)statb.st_mtime;
+    }
+    if (!mail_var_path_changed && mailtime_hash != new_hash) {
+        if (mailtime_hash != 0)
+            out2str("you have mail\n");
+        mailtime_hash = new_hash;
     }
     mail_var_path_changed = 0;
@@ -10361 +10364 @@
     int done = 0;
     int err = 0;
-    char s[12];
+    char sbuf[2];
     char **optnext;
+
+    sbuf[1] = '\0';
 
     if (*param_optind < 1)
@@ -10390 +10395 @@
         if (*q == '\0') {
             if (optstr[0] == ':') {
-                s[0] = c;
-                s[1] = '\0';
-                err |= setvarsafe("OPTARG", s, 0);
+                sbuf[0] = c;
+                /*sbuf[1] = '\0'; - already is */
+                err |= setvarsafe("OPTARG", sbuf, 0);
             } else {
                 fprintf(stderr, "Illegal option -%c\n", c);
@@ -10407 +10412 @@
         if (*p == '\0' && (p = *optnext) == NULL) {
             if (optstr[0] == ':') {
-                s[0] = c;
-                s[1] = '\0';
-                err |= setvarsafe("OPTARG", s, 0);
+                sbuf[0] = c;
+                /*sbuf[1] = '\0'; - already is */
+                err |= setvarsafe("OPTARG", sbuf, 0);
                 c = ':';
             } else {
@@ -10428 +10433 @@
     *optoff = p ? p - *(optnext - 1) : -1;
     *param_optind = optnext - optfirst + 1;
-    fmtstr(s, sizeof(s), "%d", *param_optind);
-    err |= setvarsafe("OPTIND", s, VNOFUNC);
-    s[0] = c;
-    s[1] = '\0';
-    err |= setvarsafe(optvar, s, 0);
+    err |= setvarsafe("OPTIND", itoa(*param_optind), VNOFUNC);
+    sbuf[0] = c;
+    /*sbuf[1] = '\0'; - already is */
+    err |= setvarsafe(optvar, sbuf, 0);
     if (err) {
         *param_optind = 1;
@@ -10485 +10489 @@
 
 static smallint tokpushback;           /* last token pushed back */
-static smallint parsebackquote;        /* nonzero if we are inside backquotes */
 static smallint quoteflag;             /* set if (part of) last token was quoted */
 static token_id_t lasttoken;           /* last token read (integer id Txxx) */
@@ -10530 +10533 @@
 static union node *parse_command(void);
 static void parseheredoc(void);
-static char peektoken(void);
+static int peektoken(void);
 static int readtoken(void);
 
@@ -10539 +10542 @@
     int tok;
 
-    checkkwd = CHKNL | CHKKWD | CHKALIAS;
-    if (nlflag == 2 && peektoken())
-        return NULL;
     n1 = NULL;
     for (;;) {
+        switch (peektoken()) {
+        case TNL:
+            if (!(nlflag & 1))
+                break;
+            parseheredoc();
+            return n1;
+
+        case TEOF:
+            if (!n1 && (nlflag & 1))
+                n1 = NODE_EOF;
+            parseheredoc();
+            return n1;
+        }
+
+        checkkwd = CHKNL | CHKKWD | CHKALIAS;
+        if (nlflag == 2 && tokname_array[peektoken()][0])
+            return n1;
+        nlflag |= 2;
+
         n2 = andor();
         tok = readtoken();
@@ -10569 +10588 @@
         }
         switch (tok) {
+        case TNL:
+        case TEOF:
+            tokpushback = 1;
+            /* fall through */
         case TBACKGND:
         case TSEMI:
-            tok = readtoken();
-            /* fall through */
-        case TNL:
-            if (tok == TNL) {
-                parseheredoc();
-                if (nlflag == 1)
-                    return n1;
-            } else {
-                tokpushback = 1;
-            }
-            checkkwd = CHKNL | CHKKWD | CHKALIAS;
-            if (peektoken())
-                return n1;
             break;
-        case TEOF:
-            if (heredoclist)
-                parseheredoc();
-            else
-                pungetc();              /* push back EOF on input */
-            return n1;
         default:
-            if (nlflag == 1)
+            if ((nlflag & 1))
                 raise_error_unexpected_syntax(-1);
             tokpushback = 1;
@@ -10767 +10771 @@
 #if ENABLE_ASH_BASH_COMPAT
     smallint double_brackets_flag = 0;
+    smallint function_flag = 0;
 #endif
 
@@ -10783 +10788 @@
         switch (t) {
 #if ENABLE_ASH_BASH_COMPAT
+        case TFUNCTION:
+            if (peektoken() != TWORD)
+                raise_error_unexpected_syntax(TWORD);
+            function_flag = 1;
+            break;
         case TAND: /* "&&" */
         case TOR: /* "||" */
@@ -10811 +10821 @@
                 savecheckkwd = 0;
             }
+#if ENABLE_ASH_BASH_COMPAT
+            if (function_flag) {
+                checkkwd = CHKNL | CHKKWD;
+                switch (peektoken()) {
+                case TBEGIN:
+                case TIF:
+                case TCASE:
+                case TUNTIL:
+                case TWHILE:
+                case TFOR:
+                    goto do_func;
+                case TLP:
+                    function_flag = 0;
+                    break;
+                case TWORD:
+                    if (strcmp("[[", wordtext) == 0)
+                        goto do_func;
+                    /* fall through */
+                default:
+                    raise_error_unexpected_syntax(-1);
+                }
+            }
+#endif
             break;
         case TREDIR:
@@ -10818 +10851 @@
             break;
         case TLP:
+ IF_ASH_BASH_COMPAT(do_func:)
             if (args && app == &args->narg.next
              && !vars && !redir
@@ -10825 +10859 @@
 
                 /* We have a function */
-                if (readtoken() != TRP)
+                if (IF_ASH_BASH_COMPAT(!function_flag &&) readtoken() != TRP)
                     raise_error_unexpected_syntax(TRP);
                 name = n->narg.text;
@@ -10838 +10872 @@
                 return n;
             }
+            IF_ASH_BASH_COMPAT(function_flag = 0;)
             /* fall through */
         default:
@@ -10920 +10955 @@
         n1->type = NFOR;
         n1->nfor.var = wordtext;
-        checkkwd = CHKKWD | CHKALIAS;
+        checkkwd = CHKNL | CHKKWD | CHKALIAS;
         if (readtoken() == TIN) {
             app = &ap;
@@ -10947 +10982 @@
              * that the original Bourne shell only allowed NL).
              */
-            if (lasttoken != TNL && lasttoken != TSEMI)
+            if (lasttoken != TSEMI)
                 tokpushback = 1;
         }
@@ -10966 +11001 @@
         n2->narg.text = wordtext;
         n2->narg.backquote = backquotelist;
-        do {
-            checkkwd = CHKKWD | CHKALIAS;
-        } while (readtoken() == TNL);
-        if (lasttoken != TIN)
+        checkkwd = CHKNL | CHKKWD | CHKALIAS;
+        if (readtoken() != TIN)
             raise_error_unexpected_syntax(TIN);
         cpp = &n1->ncase.cases;
@@ -11020 +11053 @@
         t = TEND;
         break;
+    IF_ASH_BASH_COMPAT(case TFUNCTION:)
     case TWORD:
     case TREDIR:
@@ -11138 +11172 @@
     IF_ASH_BASH_COMPAT(smallint bash_dollar_squote = 0;)
 
-#if __GNUC__
-    /* Avoid longjmp clobbering */
-    (void) &out;
-    (void) &quotef;
-    (void) &dblquote;
-    (void) &varnest;
-    (void) &arinest;
-    (void) &parenlevel;
-    (void) &dqvarnest;
-    (void) &oldstyle;
-    (void) &prevsyntax;
-    (void) &syntax;
-#endif
     startlinno = g_parsefile->linno;
     bqlist = NULL;
@@ -11220 +11241 @@
                  && (c != '"' || eofmark != NULL)
                 ) {
-                    USTPUTC(CTLESC, out);
                     USTPUTC('\\', out);
                 }
-                if (SIT(c, SQSYNTAX) == CCTL)
-                    USTPUTC(CTLESC, out);
+                USTPUTC(CTLESC, out);
                 USTPUTC(c, out);
                 quotef = 1;
@@ -11242 +11261 @@
         case CENDQUOTE:
             IF_ASH_BASH_COMPAT(bash_dollar_squote = 0;)
-            if (eofmark != NULL && arinest == 0
-             && varnest == 0
-            ) {
+            if (eofmark != NULL && varnest == 0) {
                 USTPUTC(c, out);
             } else {
@@ -11278 +11295 @@
             } else {
                 if (pgetc() == ')') {
+                    c = CTLENDARI;
                     if (--arinest == 0) {
                         syntax = prevsyntax;
-                        dblquote = (syntax == DQSYNTAX);
-                        c = CTLENDARI;
                     }
                 } else {
@@ -11323 +11339 @@
         raise_error_syntax("missing '))'");
 #endif
-    if (syntax != BASESYNTAX && !parsebackquote && eofmark == NULL)
+    if (syntax != BASESYNTAX && eofmark == NULL)
         raise_error_syntax("unterminated quoted string");
     if (varnest != 0) {
@@ -11485 +11501 @@
     ) {
 #if ENABLE_ASH_BASH_COMPAT
-        if (c == '\'')
+        if (syntax != DQSYNTAX && c == '\'')
             bash_dollar_squote = 1;
         else
@@ -11600 +11616 @@
             pungetc();
         }
-        if (dblquote || arinest)
-            flags |= VSQUOTE;
         ((unsigned char *)stackblock())[typeloc] = subtype | flags;
         if (subtype != VSNORMAL) {
             varnest++;
-            if (dblquote || arinest) {
+            if (dblquote) {
                 dqvarnest++;
             }
@@ -11621 +11635 @@
 parsebackq: {
     struct nodelist **nlpp;
-    smallint savepbq;
     union node *n;
-    char *volatile str;
-    struct jmploc jmploc;
-    struct jmploc *volatile savehandler;
+    char *str;
     size_t savelen;
     smallint saveprompt = 0;
 
-#ifdef __GNUC__
-    (void) &saveprompt;
-#endif
-    savepbq = parsebackquote;
-    if (setjmp(jmploc.loc)) {
-        free(str);
-        parsebackquote = 0;
-        exception_handler = savehandler;
-        longjmp(exception_handler->loc, 1);
-    }
-    INT_OFF;
     str = NULL;
     savelen = out - (char *)stackblock();
     if (savelen > 0) {
-        str = ckmalloc(savelen);
+        str = alloca(savelen);
         memcpy(str, stackblock(), savelen);
     }
-    savehandler = exception_handler;
-    exception_handler = &jmploc;
-    INT_ON;
     if (oldstyle) {
         /* We must read until the closing backquote, giving special
@@ -11719 +11716 @@
     *nlpp = stzalloc(sizeof(**nlpp));
     /* (*nlpp)->next = NULL; - stzalloc did it */
-    parsebackquote = oldstyle;
 
     if (oldstyle) {
@@ -11748 +11744 @@
         memcpy(out, str, savelen);
         STADJUST(savelen, out);
-        INT_OFF;
-        free(str);
-        str = NULL;
-        INT_ON;
-    }
-    parsebackquote = savepbq;
-    exception_handler = savehandler;
-    if (arinest || dblquote)
-        USTPUTC(CTLBACKQ | CTLQUOTE, out);
-    else
-        USTPUTC(CTLBACKQ, out);
+    }
+    USTPUTC(CTLBACKQ, out);
     if (oldstyle)
         goto parsebackq_oldreturn;
@@ -11772 +11759 @@
         prevsyntax = syntax;
         syntax = ARISYNTAX;
-        USTPUTC(CTLARI, out);
-        if (dblquote)
-            USTPUTC('"', out);
-        else
-            USTPUTC(' ', out);
-    } else {
-        /*
-         * we collapse embedded arithmetic expansion to
-         * parenthesis, which should be equivalent
-         */
-        USTPUTC('(', out);
-    }
+    }
+    USTPUTC(CTLARI, out);
     goto parsearith_return;
 }
 #endif
-
 } /* end of readtoken */
 
@@ -11958 +11934 @@
 {
     int t;
+    int kwd = checkkwd;
 #if DEBUG
     smallint alreadyseen = tokpushback;
@@ -11971 +11948 @@
      * eat newlines
      */
-    if (checkkwd & CHKNL) {
+    if (kwd & CHKNL) {
         while (t == TNL) {
             parseheredoc();
@@ -11985 +11962 @@
      * check for keywords
      */
-    if (checkkwd & CHKKWD) {
+    if (kwd & CHKKWD) {
         const char *const *pp;
 
@@ -12019 +11996 @@
 }
 
-static char
+static int
 peektoken(void)
 {
@@ -12026 +12003 @@
     t = readtoken();
     tokpushback = 1;
-    return tokname_array[t][0];
+    return t;
 }
 
@@ -12036 +12013 @@
 parsecmd(int interact)
 {
-    int t;
-
     tokpushback = 0;
+    checkkwd = 0;
+    heredoclist = 0;
     doprompt = interact;
     setprompt_if(doprompt, doprompt);
     needprompt = 0;
-    t = readtoken();
-    if (t == TEOF)
-        return NODE_EOF;
-    if (t == TNL)
-        return NULL;
-    tokpushback = 1;
     return list(1);
 }
@@ -12098 +12069 @@
     n.narg.backquote = backquotelist;
 
-    expandarg(&n, NULL, 0);
+    expandarg(&n, NULL, EXP_QUOTED);
     return stackblock();
 }
@@ -12180 +12151 @@
 #if JOBS
         if (doing_jobctl)
-            showjobs(stderr, SHOW_CHANGED);
+            showjobs(SHOW_CHANGED|SHOW_STDERR);
 #endif
         inter = 0;
@@ -12277 +12248 @@
     exitstatus = 0;
 
+    /* This aborts if file isn't found, which is POSIXly correct.
+     * bash returns exitcode 1 instead.
+     */
     fullname = find_dot_file(argv[1]);
-
     argv += 2;
     argc -= 2;
@@ -12288 +12261 @@
     };
 
+    /* This aborts if file can't be opened, which is POSIXly correct.
+     * bash returns exitcode 1 instead.
+     */
     setinputfile(fullname, INPUT_PUSH_FILE);
     commandname = fullname;
@@ -12595 +12571 @@
 /* ============ Builtins */
 
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-/*
- * Lists available builtins
- */
+#if ENABLE_ASH_HELP
 static int FAST_FUNC
 helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
@@ -12616 +12589 @@
         }
     }
-#if ENABLE_FEATURE_SH_STANDALONE
+# if ENABLE_FEATURE_SH_STANDALONE
     {
         const char *a = applet_names;
@@ -12625 +12598 @@
                 col = 0;
             }
-            a += strlen(a) + 1;
-        }
-    }
-#endif
+            while (*a++ != '\0')
+                continue;
+        }
+    }
+# endif
     out1fmt("\n\n");
     return EXIT_SUCCESS;
 }
-#endif /* FEATURE_SH_EXTRA_QUIET */
+#endif
+
+#if MAX_HISTORY
+static int FAST_FUNC
+historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+    show_history(line_input_state);
+    return EXIT_SUCCESS;
+}
+#endif
 
 /*
@@ -12749 +12732 @@
     struct tms buf;
 
-    clk_tck = sysconf(_SC_CLK_TCK);
+    clk_tck = bb_clk_tck();
     times(&buf);
 
@@ -12844 +12827 @@
      */
     INT_OFF;
-    r = shell_builtin_read(setvar2,
+    r = shell_builtin_read(setvar0,
         argptr,
         bltinlookup("IFS"), /* can be NULL */
@@ -12862 +12845 @@
 
 static int FAST_FUNC
-umaskcmd(int argc UNUSED_PARAM, char **argv)
-{
-    static const char permuser[3] ALIGN1 = "ugo";
-    static const char permmode[3] ALIGN1 = "rwx";
-    static const short permmask[] ALIGN2 = {
-        S_IRUSR, S_IWUSR, S_IXUSR,
-        S_IRGRP, S_IWGRP, S_IXGRP,
-        S_IROTH, S_IWOTH, S_IXOTH
-    };
-
-    /* TODO: use bb_parse_mode() instead */
-
-    char *ap;
+umaskcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+    static const char permuser[3] ALIGN1 = "ogu";
+
     mode_t mask;
-    int i;
     int symbolic_mode = 0;
 
@@ -12888 +12861 @@
     INT_ON;
 
-    ap = *argptr;
-    if (ap == NULL) {
+    if (*argptr == NULL) {
         if (symbolic_mode) {
-            char buf[18];
+            char buf[sizeof(",u=rwx,g=rwx,o=rwx")];
             char *p = buf;
-
-            for (i = 0; i < 3; i++) {
-                int j;
-
+            int i;
+
+            i = 2;
+            for (;;) {
+                *p++ = ',';
                 *p++ = permuser[i];
                 *p++ = '=';
-                for (j = 0; j < 3; j++) {
-                    if ((mask & permmask[3 * i + j]) == 0) {
-                        *p++ = permmode[j];
-                    }
-                }
-                *p++ = ',';
+                /* mask is 0..0uuugggooo. i=2 selects uuu bits */
+                if (!(mask & 0400)) *p++ = 'r';
+                if (!(mask & 0200)) *p++ = 'w';
+                if (!(mask & 0100)) *p++ = 'x';
+                mask <<= 3;
+                if (--i < 0)
+                    break;
             }
-            *--p = 0;
-            puts(buf);
+            *p = '\0';
+            puts(buf + 1);
         } else {
-            out1fmt("%.4o\n", mask);
+            out1fmt("%04o\n", mask);
         }
     } else {
-        if (isdigit((unsigned char) *ap)) {
-            mask = 0;
-            do {
-                if (*ap >= '8' || *ap < '0')
-                    ash_msg_and_raise_error(msg_illnum, argv[1]);
-                mask = (mask << 3) + (*ap - '0');
-            } while (*++ap != '\0');
-            umask(mask);
-        } else {
-            mask = ~mask & 0777;
-            if (!bb_parse_mode(ap, &mask)) {
-                ash_msg_and_raise_error("illegal mode: %s", ap);
-            }
-            umask(~mask & 0777);
-        }
+        char *modestr = *argptr;
+                /* numeric umasks are taken as-is */
+                /* symbolic umasks are inverted: "umask a=rx" calls umask(222) */
+        if (!isdigit(modestr[0]))
+            mask ^= 0777;
+        mask = bb_parse_mode(modestr, mask);
+        if ((unsigned)mask > 0777) {
+            ash_msg_and_raise_error("illegal mode: %s", modestr);
+        }
+        if (!isdigit(modestr[0]))
+            mask ^= 0777;
+        umask(mask);
     }
     return 0;
@@ -13005 +12976 @@
         }
 
-        setvar("PPID", utoa(getppid()), 0);
-
+        setvar0("PPID", utoa(getppid()));
+#if ENABLE_ASH_BASH_COMPAT
+        p = lookupvar("SHLVL");
+        setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
+        if (!lookupvar("HOSTNAME")) {
+            struct utsname uts;
+            uname(&uts);
+            setvar0("HOSTNAME", uts.nodename);
+        }
+#endif
         p = lookupvar("PWD");
         if (p) {
@@ -13185 +13164 @@
         }
         if (e == EXINT) {
-            outcslow('\n', stderr);
+            newline_and_flush(stderr);
         }
 
@@ -13210 +13189 @@
     procargs(argv);
 
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
-    if (iflag) {
-        const char *hp = lookupvar("HISTFILE");
-        if (!hp) {
-            hp = lookupvar("HOME");
-            if (hp) {
-                char *defhp = concat_path_file(hp, ".ash_history");
-                setvar("HISTFILE", defhp, 0);
-                free(defhp);
-            }
-        }
-    }
-#endif
     if (argv[0] && argv[0][0] == '-')
         isloginsh = 1;
     if (isloginsh) {
+        const char *hp;
+
         state = 1;
         read_profile("/etc/profile");
  state1:
         state = 2;
-        read_profile(".profile");
+        hp = lookupvar("HOME");
+        if (hp) {
+            hp = concat_path_file(hp, ".profile");
+            read_profile(hp);
+            free((char*)hp);
+        }
     }
  state2:
@@ -13262 +13235 @@
         if (iflag) {
             const char *hp = lookupvar("HISTFILE");
+            if (!hp) {
+                hp = lookupvar("HOME");
+                if (hp) {
+                    hp = concat_path_file(hp, ".ash_history");
+                    setvar0("HISTFILE", hp);
+                    free((char*)hp);
+                    hp = lookupvar("HISTFILE");
+                }
+            }
             if (hp)
                 line_input_state->hist_file = hp;