Merge branch 'busybox' into merge

42 files changed, 696 insertions, 684 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 81845dc60..36ddda1bc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -66,6 +66,22 @@
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:
+//config:config ASH_BASH_SOURCE_CURDIR
+//config:       bool "'source' and '.' builtins search current directory after $PATH"
+//config:       default n   # do not encourage non-standard behavior
+//config:       depends on ASH_BASH_COMPAT
+//config:       help
+//config:       This is not compliant with standards. Avoid if possible.
+//config:
+//config:config ASH_BASH_NOT_FOUND_HOOK
+//config:       bool "command_not_found_handle hook support"
+//config:       default y
+//config:       depends on ASH_BASH_COMPAT
+//config:       help
+//config:       Enable support for the 'command_not_found_handle' hook function,
+//config:       from GNU bash, which allows for alternative command not found
+//config:       handling.
+//config:
 //config:config ASH_JOB_CONTROL
 //config:       bool "Job control"
 //config:       default y
@@ -278,6 +294,19 @@ typedef long arith_t;
 # error "Do not even bother, ash will not run on NOMMU machine"
 #endif
 
+/* We use a trick to have more optimized code (fewer pointer reloads):
+ *  ash.c:   extern struct globals *const ash_ptr_to_globals;
+ *  ash_ptr_hack.c: struct globals *ash_ptr_to_globals;
+ * This way, compiler in ash.c knows the pointer can not change.
+ *
+ * However, this may break on weird arches or toolchains. In this case,
+ * set "-DBB_GLOBAL_CONST=''" in CONFIG_EXTRA_CFLAGS to disable
+ * this optimization.
+ */
+#ifndef BB_GLOBAL_CONST
+# define BB_GLOBAL_CONST const
+#endif
+
 #if ENABLE_PLATFORM_MINGW32
 union node;
 struct strlist;
@@ -393,6 +422,8 @@ struct globals_misc {
         /* shell level: 0 for the main shell, 1 for its children, and so on */
         int shlvl;
 #define rootshell (!shlvl)
+        int errlinno;
+
         char *minusc;  /* argument to -c option */
 
         char *curdir; // = nullstr;     /* current working directory */
@@ -469,13 +500,14 @@ struct globals_misc {
 #endif
         pid_t backgndpid;        /* pid of last background process */
 };
-extern struct globals_misc *const ash_ptr_to_globals_misc;
+extern struct globals_misc *BB_GLOBAL_CONST ash_ptr_to_globals_misc;
 #define G_misc (*ash_ptr_to_globals_misc)
 #define exitstatus        (G_misc.exitstatus )
 #define back_exitstatus   (G_misc.back_exitstatus )
 #define job_warning       (G_misc.job_warning)
 #define rootpid     (G_misc.rootpid    )
 #define shlvl       (G_misc.shlvl      )
+#define errlinno    (G_misc.errlinno   )
 #define minusc      (G_misc.minusc     )
 #define curdir      (G_misc.curdir     )
 #define physdir     (G_misc.physdir    )
@@ -810,6 +842,7 @@ union node;
 
 struct ncmd {
         smallint type; /* Nxxxx */
+        int linno;
         union node *assign;
         union node *args;
         union node *redirect;
@@ -823,6 +856,7 @@ struct npipe {
 
 struct nredir {
         smallint type;
+        int linno;
         union node *n;
         union node *redirect;
 };
@@ -842,6 +876,7 @@ struct nif {
 
 struct nfor {
         smallint type;
+        int linno;
         union node *args;
         union node *body;
         char *var;
@@ -849,6 +884,7 @@ struct nfor {
 
 struct ncase {
         smallint type;
+        int linno;
         union node *expr;
         union node *cases;
 };
@@ -860,6 +896,13 @@ struct nclist {
         union node *body;
 };
 
+struct ndefun {
+        smallint type;
+        int linno;
+        char *text;
+        union node *body;
+};
+
 struct narg {
         smallint type;
         union node *next;
@@ -911,6 +954,7 @@ union node {
         struct nfor nfor;
         struct ncase ncase;
         struct nclist nclist;
+        struct ndefun ndefun;
         struct narg narg;
         struct nfile nfile;
         struct ndup ndup;
@@ -1340,7 +1384,6 @@ struct parsefile {
 
 static struct parsefile basepf;        /* top level input file */
 static struct parsefile *g_parsefile = &basepf;  /* current input file */
-static int startlinno;                 /* line # where last token started */
 static char *commandname;              /* currently executing command */
 
 
@@ -1354,7 +1397,7 @@ ash_vmsg(const char *msg, va_list ap)
                 if (strcmp(arg0, commandname))
                         fprintf(stderr, "%s: ", commandname);
                 if (!iflag || g_parsefile->pf_fd > 0)
-                        fprintf(stderr, "line %d: ", startlinno);
+                        fprintf(stderr, "line %d: ", errlinno);
         }
         vfprintf(stderr, msg, ap);
         newline_and_flush(stderr);
@@ -1407,6 +1450,7 @@ static void raise_error_syntax(const char *) NORETURN;
 static void
 raise_error_syntax(const char *msg)
 {
+        errlinno = g_parsefile->linno;
         ash_msg_and_raise_error("syntax error: %s", msg);
         /* NOTREACHED */
 }
@@ -1529,7 +1573,7 @@ struct globals_memstack {
         size_t g_stacknleft; // = MINSIZE;
         struct stack_block stackbase;
 };
-extern struct globals_memstack *const ash_ptr_to_globals_memstack;
+extern struct globals_memstack *BB_GLOBAL_CONST ash_ptr_to_globals_memstack;
 #define G_memstack (*ash_ptr_to_globals_memstack)
 #define g_stackp     (G_memstack.g_stackp    )
 #define g_stacknxt   (G_memstack.g_stacknxt  )
@@ -1619,7 +1663,7 @@ sstrdup(const char *p)
         return memcpy(stalloc(len), p, len);
 }
 
-static inline void
+static ALWAYS_INLINE void
 grabstackblock(size_t len)
 {
         stalloc(len);
@@ -2094,6 +2138,7 @@ static const struct {
 #if ENABLE_ASH_GETOPTS
         { VSTRFIXED|VTEXTFIXED       , defoptindvar, getoptsreset    },
 #endif
+        { VSTRFIXED|VTEXTFIXED       , NULL /* inited to linenovar */, NULL },
 #if ENABLE_ASH_RANDOM_SUPPORT
         { VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM", change_random },
 #endif
@@ -2114,25 +2159,18 @@ struct globals_var {
         int preverrout_fd;   /* stderr fd: usually 2, unless redirect moved it */
         struct var *vartab[VTABSIZE];
         struct var varinit[ARRAY_SIZE(varinit_data)];
+        int lineno;
+        char linenovar[sizeof("LINENO=") + sizeof(int)*3];
 };
-extern struct globals_var *const ash_ptr_to_globals_var;
+extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
 #define G_var (*ash_ptr_to_globals_var)
 #define shellparam    (G_var.shellparam   )
 //#define redirlist     (G_var.redirlist    )
 #define preverrout_fd (G_var.preverrout_fd)
 #define vartab        (G_var.vartab       )
 #define varinit       (G_var.varinit      )
-#define INIT_G_var() do { \
-        unsigned i; \
-        (*(struct globals_var**)&ash_ptr_to_globals_var) = xzalloc(sizeof(G_var)); \
-        barrier(); \
-        for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \
-                varinit[i].flags    = varinit_data[i].flags; \
-                varinit[i].var_text = varinit_data[i].var_text; \
-                varinit[i].var_func = varinit_data[i].var_func; \
-        } \
-} while (0)
-
+#define lineno        (G_var.lineno       )
+#define linenovar     (G_var.linenovar    )
 #define vifs      varinit[0]
 #if ENABLE_ASH_MAIL
 # define vmail    (&vifs)[1]
@@ -2146,14 +2184,28 @@ extern struct globals_var *const ash_ptr_to_globals_var;
 #define vps4      (&vps2)[1]
 #if ENABLE_ASH_GETOPTS
 # define voptind  (&vps4)[1]
+# define vlineno  (&voptind)[1]
 # if ENABLE_ASH_RANDOM_SUPPORT
-#  define vrandom (&voptind)[1]
+#  define vrandom (&vlineno)[1]
 # endif
 #else
+# define vlineno  (&vps4)[1]
 # if ENABLE_ASH_RANDOM_SUPPORT
-#  define vrandom (&vps4)[1]
+#  define vrandom (&vlineno)[1]
 # endif
 #endif
+#define INIT_G_var() do { \
+        unsigned i; \
+        (*(struct globals_var**)&ash_ptr_to_globals_var) = xzalloc(sizeof(G_var)); \
+        barrier(); \
+        for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \
+                varinit[i].flags    = varinit_data[i].flags; \
+                varinit[i].var_text = varinit_data[i].var_text; \
+                varinit[i].var_func = varinit_data[i].var_func; \
+        } \
+        strcpy(linenovar, "LINENO="); \
+        vlineno.var_text = linenovar; \
+} while (0)
 
 /*
  * The following macros access the values of the above variables.
@@ -2289,8 +2341,12 @@ lookupvar(const char *name)
                 if (v->flags & VDYNAMIC)
                         v->var_func(NULL);
 #endif
-                if (!(v->flags & VUNSET))
+                if (!(v->flags & VUNSET)) {
+                        if (v == &vlineno && v->var_text == linenovar) {
+                                fmtstr(linenovar+7, sizeof(linenovar)-7, "%d", lineno);
+                        }
                         return var_end(v->var_text);
+                }
         }
         return NULL;
 }
@@ -5125,7 +5181,7 @@ cmdtxt(union node *n)
                 p = "; done";
                 goto dodo;
         case NDEFUN:
-                cmdputs(n->narg.text);
+                cmdputs(n->ndefun.text);
                 p = "() { ... }";
                 goto dotail2;
         case NCMD:
@@ -6151,6 +6207,26 @@ ash_arith(const char *s)
         return result;
 }
 #endif
+#if BASH_SUBSTR
+# if ENABLE_FEATURE_SH_MATH
+static int substr_atoi(const char *s)
+{
+        arith_t t = ash_arith(s);
+        if (sizeof(t) > sizeof(int)) {
+                /* clamp very large or very large negative nums for ${v:N:M}:
+                 * else "${v:0:0x100000001}" would work as "${v:0:1}"
+                 */
+                if (t > INT_MAX)
+                        t = INT_MAX;
+                if (t < INT_MIN)
+                        t = INT_MIN;
+        }
+        return t;
+}
+# else
+#  define substr_atoi(s) number(s)
+# endif
+#endif
 
 /*
  * expandarg flags
@@ -6182,7 +6258,6 @@ ash_arith(const char *s)
 #define RMESCAPE_GLOB   0x2     /* Add backslashes for glob */
 #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)
@@ -6363,8 +6438,12 @@ esclen(const char *start, const char *p)
 /*
  * Remove any CTLESC characters from a string.
  */
+#if !BASH_PATTERN_SUBST
+#define rmescapes(str, flag, slash_position) \
+        rmescapes(str, flag)
+#endif
 static char *
-rmescapes(char *str, int flag)
+rmescapes(char *str, int flag, int *slash_position)
 {
         static const char qchars[] ALIGN1 = {
                 IF_BASH_PATTERN_SUBST('/',) CTLESC, CTLQUOTEMARK, '\0' };
@@ -6373,9 +6452,8 @@ rmescapes(char *str, int flag)
         unsigned inquotes;
         unsigned protect_against_glob;
         unsigned globbing;
-        IF_BASH_PATTERN_SUBST(unsigned slash = flag & RMESCAPE_SLASH;)
 
-        p = strpbrk(str, qchars IF_BASH_PATTERN_SUBST(+ !slash));
+        p = strpbrk(str, qchars IF_BASH_PATTERN_SUBST(+ !slash_position));
         if (!p)
                 return str;
 
@@ -6455,10 +6533,11 @@ rmescapes(char *str, int flag)
                         goto copy;
                 }
 #if BASH_PATTERN_SUBST
-                else if (*p == '/' && slash) {
-                        /* stop handling globbing and mark location of slash */
-                        globbing = slash = 0;
-                        *p = CTLESC;
+                else if (slash_position && p == str + *slash_position) {
+                        /* stop handling globbing */
+                        globbing = 0;
+                        *slash_position = q - r;
+                        slash_position = NULL;
                 }
 #endif
                 protect_against_glob = globbing;
@@ -6482,7 +6561,7 @@ rmescapes(char *str, int flag)
 static char *
 preglob(const char *pattern, int flag)
 {
-        return rmescapes((char *)pattern, flag | RMESCAPE_GLOB);
+        return rmescapes((char *)pattern, flag | RMESCAPE_GLOB, NULL);
 }
 
 /*
@@ -6837,7 +6916,7 @@ expari(int flag)
         expdest = p;
 
         if (flag & QUOTES_ESC)
-                rmescapes(p + 1, 0);
+                rmescapes(p + 1, 0, NULL);
 
         len = cvtnum(ash_arith(p + 1));
 
@@ -7125,20 +7204,58 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
         char *rmesc, *rmescend;
         char *str;
         int amount, resetloc;
+        int argstr_flags;
         IF_BASH_PATTERN_SUBST(int workloc;)
-        IF_BASH_PATTERN_SUBST(char *repl = NULL;)
+        IF_BASH_PATTERN_SUBST(int slash_pos;)
+        IF_BASH_PATTERN_SUBST(char *repl;)
         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);
 
-        argstr(p, EXP_TILDE | (subtype != VSASSIGN && subtype != VSQUESTION ?
-                        (flag & (EXP_QUOTED | EXP_QPAT) ? EXP_QPAT : EXP_CASE) : 0)
-        );
+#if BASH_PATTERN_SUBST
+        /* For "${v/pattern/repl}", we must find the delimiter _before_
+         * argstr() call expands possible variable references in pattern:
+         * think about "v=a; a=a/; echo ${v/$a/r}" case.
+         */
+        repl = NULL;
+        if (subtype == VSREPLACE || subtype == VSREPLACEALL) {
+                /* Find '/' and replace with NUL */
+                repl = p;
+                for (;;) {
+                        /* Handle escaped slashes, e.g. "${v/\//_}" (they are CTLESC'ed by this point) */
+                        if (*repl == '\0') {
+                                repl = NULL;
+                                break;
+                        }
+                        if (*repl == '/') {
+                                *repl = '\0';
+                                break;
+                        }
+                        if ((unsigned char)*repl == CTLESC && repl[1])
+                                repl++;
+                        repl++;
+                }
+        }
+#endif
+        argstr_flags = EXP_TILDE;
+        if (subtype != VSASSIGN && subtype != VSQUESTION)
+                argstr_flags |= (flag & (EXP_QUOTED | EXP_QPAT) ? EXP_QPAT : EXP_CASE);
+        argstr(p, argstr_flags);
+#if BASH_PATTERN_SUBST
+        slash_pos = -1;
+        if (repl) {
+                slash_pos = expdest - ((char *)stackblock() + strloc);
+                STPUTC('/', expdest);
+                argstr(repl + 1, argstr_flags);
+                *repl = '/';
+        }
+#endif
         STPUTC('\0', expdest);
         argbackq = saveargbackq;
         startp = (char *)stackblock() + startloc;
+        //bb_error_msg("str1:'%s'", (char *)stackblock() + strloc);
 
         switch (subtype) {
         case VSASSIGN:
@@ -7158,13 +7275,10 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
 
                 loc = str = stackblock() + strloc;
 
-# if !ENABLE_FEATURE_SH_MATH
-#  define ash_arith number
-# endif
                 /* Read POS in ${var:POS:LEN} */
                 colon = strchr(loc, ':');
                 if (colon) *colon = '\0';
-                pos = ash_arith(loc);
+                pos = substr_atoi(loc);
                 if (colon) *colon = ':';
 
                 /* Read LEN in ${var:POS:LEN} */
@@ -7172,7 +7286,6 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
                 /* *loc != '\0', guaranteed by parser */
                 if (quotes) {
                         char *ptr;
-
                         /* Adjust the length by the number of escapes */
                         for (ptr = startp; ptr < (str - 1); ptr++) {
                                 if ((unsigned char)*ptr == CTLESC) {
@@ -7184,19 +7297,15 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
                 orig_len = len;
                 if (*loc++ == ':') {
                         /* ${var::LEN} */
-                        len = ash_arith(loc);
+                        len = substr_atoi(loc);
                 } else {
                         /* Skip POS in ${var:POS:LEN} */
                         len = orig_len;
-                        while (*loc && *loc != ':') {
+                        while (*loc && *loc != ':')
                                 loc++;
-                        }
-                        if (*loc++ == ':') {
-                                len = ash_arith(loc);
-                        }
+                        if (*loc++ == ':')
+                                len = substr_atoi(loc);
                 }
-#  undef ash_arith
-
                 if (pos < 0) {
                         /* ${VAR:$((-n)):l} starts n chars from the end */
                         pos = orig_len + pos;
@@ -7236,6 +7345,8 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
         resetloc = expdest - (char *)stackblock();
 
 #if BASH_PATTERN_SUBST
+        repl = NULL;
+
         /* We'll comeback here if we grow the stack while handling
          * a VSREPLACE or VSREPLACEALL, since our pointers into the
          * stack will need rebasing, and we'll need to remove our work
@@ -7250,8 +7361,10 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
 
         rmesc = startp;
         rmescend = (char *)stackblock() + strloc;
+        //bb_error_msg("str7:'%s'", rmescend);
         if (quotes) {
-                rmesc = rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW);
+//TODO: how to handle slash_pos here if string changes (shortens?)
+                rmesc = rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW, NULL);
                 if (rmesc != startp) {
                         rmescend = expdest;
                         startp = (char *)stackblock() + startloc;
@@ -7264,12 +7377,13 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
          * 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
+         * "&slash_pos" causes rmescapes() to work differently on the pattern
          * and string.  It's only used on the first call.
          */
-        preglob(str, IF_BASH_PATTERN_SUBST(
-                (subtype == VSREPLACE || subtype == VSREPLACEALL) && !repl ?
-                        RMESCAPE_SLASH : ) 0);
+        //bb_error_msg("str8:'%s' slash_pos:%d", str, slash_pos);
+        rmescapes(str, RMESCAPE_GLOB,
+                repl ? NULL : (slash_pos < 0 ? NULL : &slash_pos)
+        );
 
 #if BASH_PATTERN_SUBST
         workloc = expdest - (char *)stackblock();
@@ -7278,11 +7392,12 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
                 char *idx, *end;
 
                 if (!repl) {
-                        repl = strchr(str, CTLESC);
-                        if (repl)
+                        //bb_error_msg("str9:'%s' slash_pos:%d", str, slash_pos);
+                        repl = nullstr;
+                        if (slash_pos >= 0) {
+                                repl = str + slash_pos;
                                 *repl++ = '\0';
-                        else
-                                repl = nullstr;
+                        }
                 }
                 //bb_error_msg("str:'%s' repl:'%s'", str, repl);
 
@@ -7802,7 +7917,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                         INT_ON;
  nometa:
                         *exparg.lastp = str;
-                        rmescapes(str->text, 0);
+                        rmescapes(str->text, 0, NULL);
                         exparg.lastp = &str->next;
                         break;
                 default:        /* GLOB_NOSPACE */
@@ -8031,7 +8146,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                          */
  nometa:
                         *exparg.lastp = str;
-                        rmescapes(str->text, 0);
+                        rmescapes(str->text, 0, NULL);
                         exparg.lastp = &str->next;
                 } else {
                         *exparg.lastp = NULL;
@@ -8970,6 +9085,10 @@ calcsize(union node *n)
                 IF_PLATFORM_MINGW32(nodeptrsize += 3);
                 break;
         case NDEFUN:
+                calcsize(n->ndefun.body);
+                funcstringsize += strlen(n->ndefun.text) + 1;
+                IF_PLATFORM_MINGW32(nodeptrsize += 2);
+                break;
         case NARG:
                 sizenodelist(n->narg.backquote);
                 funcstringsize += strlen(n->narg.text) + 1;
@@ -9067,6 +9186,7 @@ copynode(union node *n)
                 new->ncmd.redirect = copynode(n->ncmd.redirect);
                 new->ncmd.args = copynode(n->ncmd.args);
                 new->ncmd.assign = copynode(n->ncmd.assign);
+                new->ncmd.linno = n->ncmd.linno;
                 SAVE_PTR3(new->ncmd.redirect,new->ncmd.args, new->ncmd.assign);
                 break;
         case NPIPE:
@@ -9079,6 +9199,7 @@ copynode(union node *n)
         case NSUBSHELL:
                 new->nredir.redirect = copynode(n->nredir.redirect);
                 new->nredir.n = copynode(n->nredir.n);
+                new->nredir.linno = n->nredir.linno;
                 SAVE_PTR2(new->nredir.redirect,new->nredir.n);
                 break;
         case NAND:
@@ -9100,11 +9221,13 @@ copynode(union node *n)
                 new->nfor.var = nodeckstrdup(n->nfor.var);
                 new->nfor.body = copynode(n->nfor.body);
                 new->nfor.args = copynode(n->nfor.args);
+                new->nfor.linno = n->nfor.linno;
                 SAVE_PTR3(new->nfor.var,new->nfor.body,new->nfor.args);
                 break;
         case NCASE:
                 new->ncase.cases = copynode(n->ncase.cases);
                 new->ncase.expr = copynode(n->ncase.expr);
+                new->ncase.linno = n->ncase.linno;
                 SAVE_PTR2(new->ncase.cases,new->ncase.expr);
                 break;
         case NCLIST:
@@ -9114,6 +9237,11 @@ copynode(union node *n)
                 SAVE_PTR3(new->nclist.body,new->nclist.pattern,new->nclist.next);
                 break;
         case NDEFUN:
+                new->ndefun.body = copynode(n->ndefun.body);
+                new->ndefun.text = nodeckstrdup(n->ndefun.text);
+                new->ndefun.linno = n->ndefun.linno;
+                SAVE_PTR2(new->ndefun.body,new->ndefun.text);
+                break;
         case NARG:
                 new->narg.backquote = copynodelist(n->narg.backquote);
                 new->narg.text = nodeckstrdup(n->narg.text);
@@ -9190,7 +9318,7 @@ defun(union node *func)
         INT_OFF;
         entry.cmdtype = CMDFUNCTION;
         entry.u.func = copyfunc(func);
-        addcmdentry(func->narg.text, &entry);
+        addcmdentry(func->ndefun.text, &entry);
         INT_ON;
 }
 
@@ -9200,8 +9328,8 @@ defun(union node *func)
 #define SKIPFUNC       (1 << 2)
 static smallint evalskip;       /* set to SKIPxxx if we are skipping commands */
 static int skipcount;           /* number of levels to skip */
-static int funcnest;            /* depth of function calls */
 static int loopnest;            /* current loop nesting level */
+static int funcline;            /* starting line number of current function, or 0 if not in a function */
 
 /* Forward decl way out to parsing code - dotrap needs it */
 static int evalstring(char *s, int flags);
@@ -9296,6 +9424,9 @@ evaltree(union node *n, int flags)
                 status = !evaltree(n->nnot.com, EV_TESTED);
                 goto setstatus;
         case NREDIR:
+                errlinno = lineno = n->nredir.linno;
+                if (funcline)
+                        lineno -= funcline - 1;
                 expredir(n->nredir.redirect);
                 pushredir(n->nredir.redirect);
                 status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
@@ -9450,6 +9581,10 @@ evalfor(union node *n, int flags)
         struct stackmark smark;
         int status = 0;
 
+        errlinno = lineno = n->ncase.linno;
+        if (funcline)
+                lineno -= funcline - 1;
+
         setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
@@ -9481,6 +9616,10 @@ evalcase(union node *n, int flags)
         struct stackmark smark;
         int status = 0;
 
+        errlinno = lineno = n->ncase.linno;
+        if (funcline)
+                lineno -= funcline - 1;
+
         setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
@@ -9516,6 +9655,10 @@ evalsubshell(union node *n, int flags)
         int backgnd = (n->type == NBACKGND); /* FORK_BG(1) if yes, else FORK_FG(0) */
         int status;
 
+        errlinno = lineno = n->nredir.linno;
+        if (funcline)
+                lineno -= funcline - 1;
+
         expredir(n->nredir.redirect);
         if (!backgnd && (flags & EV_EXIT) && !may_have_traps)
                 goto nofork;
@@ -9846,8 +9989,10 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         struct jmploc *volatile savehandler;
         struct jmploc jmploc;
         int e;
+        int savefuncline;
 
         saveparam = shellparam;
+        savefuncline = funcline;
         savehandler = exception_handler;
         e = setjmp(jmploc.loc);
         if (e) {
@@ -9857,7 +10002,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         exception_handler = &jmploc;
         shellparam.malloced = 0;
         func->count++;
-        funcnest++;
+        funcline = func->n.ndefun.linno;
         INT_ON;
         shellparam.nparam = argc - 1;
         shellparam.p = argv + 1;
@@ -9866,11 +10011,11 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         shellparam.optoff = -1;
 #endif
         pushlocalvars();
-        evaltree(func->n.narg.next, flags & EV_TESTED);
+        evaltree(func->n.ndefun.body, flags & EV_TESTED);
         poplocalvars(0);
  funcdone:
         INT_OFF;
-        funcnest--;
+        funcline = savefuncline;
         freefunc(func);
         freeparam(&shellparam);
         shellparam = saveparam;
@@ -10235,6 +10380,10 @@ evalcommand(union node *cmd, int flags)
         char **nargv;
         smallint cmd_is_exec;
 
+        errlinno = lineno = cmd->ncmd.linno;
+        if (funcline)
+                lineno -= funcline - 1;
+
         /* First expand the arguments. */
         TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
         setstackmark(&smark);
@@ -10280,7 +10429,7 @@ evalcommand(union node *cmd, int flags)
         *nargv = NULL;
 
         lastarg = NULL;
-        if (iflag && funcnest == 0 && argc > 0)
+        if (iflag && funcline == 0 && argc > 0)
                 lastarg = nargv[-1];
 
         expredir(cmd->ncmd.redirect);
@@ -10410,7 +10559,9 @@ evalcommand(union node *cmd, int flags)
         switch (cmdentry.cmdtype) {
         default: {
 
-#if ENABLE_FEATURE_SH_NOFORK
+#if ENABLE_FEATURE_SH_STANDALONE \
+ && ENABLE_FEATURE_SH_NOFORK \
+ && NUM_APPLETS > 1
 /* (1) BUG: if variables are set, we need to fork, or save/restore them
  *     around run_nofork_applet() call.
  * (2) Should this check also be done in forkshell()?
@@ -11341,7 +11492,7 @@ shiftcmd(int argc UNUSED_PARAM, char **argv)
         if (argv[1])
                 n = number(argv[1]);
         if (n > shellparam.nparam)
-                n = 0; /* bash compat, was = shellparam.nparam; */
+                return 1;
         INT_OFF;
         shellparam.nparam -= n;
         for (ap1 = shellparam.p; --n >= 0; ap1++) {
@@ -11811,7 +11962,7 @@ parsefname(void)
                 if (quoteflag == 0)
                         n->type = NXHERE;
                 TRACE(("Here document %d\n", n->type));
-                rmescapes(wordtext, 0);
+                rmescapes(wordtext, 0, NULL);
                 here->eofmark = wordtext;
                 here->next = NULL;
                 if (heredoclist == NULL)
@@ -11836,6 +11987,7 @@ simplecmd(void)
         union node *vars, **vpp;
         union node **rpp, *redir;
         int savecheckkwd;
+        int savelinno;
 #if BASH_TEST2
         smallint double_brackets_flag = 0;
 #endif
@@ -11849,6 +12001,7 @@ simplecmd(void)
         rpp = &redir;
 
         savecheckkwd = CHKALIAS;
+        savelinno = g_parsefile->linno;
         for (;;) {
                 int t;
                 checkkwd = savecheckkwd;
@@ -11938,7 +12091,9 @@ simplecmd(void)
                                 }
                                 n->type = NDEFUN;
                                 checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                                n->narg.next = parse_command();
+                                n->ndefun.text = n->narg.text;
+                                n->ndefun.linno = g_parsefile->linno;
+                                n->ndefun.body = parse_command();
                                 return n;
                         }
                         IF_BASH_FUNCTION(function_flag = 0;)
@@ -11954,6 +12109,7 @@ simplecmd(void)
         *rpp = NULL;
         n = stzalloc(sizeof(struct ncmd));
         n->type = NCMD;
+        n->ncmd.linno = savelinno;
         n->ncmd.args = args;
         n->ncmd.assign = vars;
         n->ncmd.redirect = redir;
@@ -11969,10 +12125,13 @@ parse_command(void)
         union node *redir, **rpp;
         union node **rpp2;
         int t;
+        int savelinno;
 
         redir = NULL;
         rpp2 = &redir;
 
+        savelinno = g_parsefile->linno;
+
         switch (readtoken()) {
         default:
                 raise_error_unexpected_syntax(-1);
@@ -12023,6 +12182,7 @@ parse_command(void)
                         raise_error_syntax("bad for loop variable");
                 n1 = stzalloc(sizeof(struct nfor));
                 n1->type = NFOR;
+                n1->nfor.linno = savelinno;
                 n1->nfor.var = wordtext;
                 checkkwd = CHKNL | CHKKWD | CHKALIAS;
                 if (readtoken() == TIN) {
@@ -12063,6 +12223,7 @@ parse_command(void)
         case TCASE:
                 n1 = stzalloc(sizeof(struct ncase));
                 n1->type = NCASE;
+                n1->ncase.linno = savelinno;
                 if (readtoken() != TWORD)
                         raise_error_unexpected_syntax(TWORD);
                 n1->ncase.expr = n2 = stzalloc(sizeof(struct narg));
@@ -12114,6 +12275,7 @@ parse_command(void)
         case TLP:
                 n1 = stzalloc(sizeof(struct nredir));
                 n1->type = NSUBSHELL;
+                n1->nredir.linno = savelinno;
                 n1->nredir.n = list(0);
                 /*n1->nredir.redirect = NULL; - stzalloc did it */
                 t = TRP;
@@ -12147,6 +12309,7 @@ parse_command(void)
                 if (n1->type != NSUBSHELL) {
                         n2 = stzalloc(sizeof(struct nredir));
                         n2->type = NREDIR;
+                        n2->nredir.linno = savelinno;
                         n2->nredir.n = n1;
                         n1 = n2;
                 }
@@ -12245,10 +12408,8 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         IF_FEATURE_SH_MATH(int arinest;)    /* levels of arithmetic expansion */
         IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */
         int dqvarnest;       /* levels of variables expansion within double quotes */
-
         IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;)
 
-        startlinno = g_parsefile->linno;
         bqlist = NULL;
         quotef = 0;
         IF_FEATURE_SH_MATH(prevsyntax = 0;)
@@ -12425,7 +12586,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         if (syntax != BASESYNTAX && eofmark == NULL)
                 raise_error_syntax("unterminated quoted string");
         if (varnest != 0) {
-                startlinno = g_parsefile->linno;
                 /* { */
                 raise_error_syntax("missing '}'");
         }
@@ -12817,7 +12977,6 @@ parsebackq: {
 
                         case PEOF:
                         IF_ASH_ALIAS(case PEOA:)
-                                startlinno = g_parsefile->linno;
                                 raise_error_syntax("EOF in backquote substitution");
 
                         case '\n':
@@ -12899,8 +13058,6 @@ parsearith: {
  *      quoted.
  * If the token is TREDIR, then we set redirnode to a structure containing
  *      the redirection.
- * In all cases, the variable startlinno is set to the number of the line
- *      on which the token starts.
  *
  * [Change comment:  here documents and internal procedures]
  * [Readtoken shouldn't have any arguments.  Perhaps we should make the
@@ -12938,7 +13095,6 @@ xxreadtoken(void)
                 return lasttoken;
         }
         setprompt_if(needprompt, 2);
-        startlinno = g_parsefile->linno;
         for (;;) {                      /* until token or start of word found */
                 c = pgetc();
                 if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
@@ -12999,7 +13155,6 @@ xxreadtoken(void)
                 return lasttoken;
         }
         setprompt_if(needprompt, 2);
-        startlinno = g_parsefile->linno;
         for (;;) {      /* until token or start of word found */
                 c = pgetc();
                 switch (c) {
@@ -13391,10 +13546,14 @@ find_dot_file(char *name)
                 if (fullname != name)
                         stunalloc(fullname);
         }
+        /* not found in PATH */
 
-        /* not found in the PATH */
+#if ENABLE_ASH_BASH_SOURCE_CURDIR
+        return name;
+#else
         ash_msg_and_raise_error("%s: not found", name);
         /* NOTREACHED */
+#endif
 }
 
 static int FAST_FUNC
@@ -13689,8 +13848,21 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
         /* We failed.  If there was an entry for this command, delete it */
         if (cmdp && updatetbl)
                 delete_cmd_entry();
-        if (act & DO_ERR)
+        if (act & DO_ERR) {
+#if ENABLE_ASH_BASH_NOT_FOUND_HOOK
+                struct tblentry *hookp = cmdlookup("command_not_found_handle", 0);
+                if (hookp && hookp->cmdtype == CMDFUNCTION) {
+                        char *argv[3];
+                        argv[0] = (char*) "command_not_found_handle";
+                        argv[1] = name;
+                        argv[2] = NULL;
+                        evalfun(hookp->param.func, 2, argv, 0);
+                        entry->cmdtype = CMDUNKNOWN;
+                        return;
+                }
+#endif
                 ash_msg("%s: %s", name, errmsg(e, "not found"));
+        }
         entry->cmdtype = CMDUNKNOWN;
         return;
 
diff --git a/shell/ash_LINENO.patch b/shell/ash_LINENO.patch
deleted file mode 100644
index a71549d6a..000000000
--- a/shell/ash_LINENO.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-This patch is a backport from dash of the combination of:
-        [SHELL] Add preliminary LINENO support
-        [VAR] Fix varinit ordering that broke fc
-        [SHELL] Improve LINENO support
-
-Applies cleanly on top of:
-        commit 9832bbaba966f0e52e183f10cd93fad7f8f643fe
-        Date: Tue Aug 15 15:44:41 2017 +0200
-
-Testsuite needs some tweaks (line numbers in some messages change).
-
-Unfortunately, it is somewhat big:
-
-function                                             old     new   delta
-parse_command                                       1581    1658     +77
-calcsize                                             203     272     +69
-copynode                                             195     257     +62
-lookupvar                                             59     108     +49
-evaltree                                             494     534     +40
-evalfor                                              152     187     +35
-evalcase                                             278     313     +35
-evalcommand                                         1547    1581     +34
-evalsubshell                                         169     199     +30
-linenovar                                              -      22     +22
-raise_error_syntax                                    11      29     +18
-evalfun                                              266     280     +14
-varinit_data                                          96     108     +12
-cmdtxt                                               626     631      +5
-lineno                                                 -       4      +4
-funcline                                               -       4      +4
-ash_vmsg                                             144     141      -3
-startlinno                                             4       -      -4
-funcnest                                               4       -      -4
-xxreadtoken                                          272     259     -13
-readtoken1                                          2635    2594     -41
-------------------------------------------------------------------------------
-(add/remove: 3/2 grow/shrink: 13/3 up/down: 510/-65)          Total: 445 bytes
-   text    data     bss     dec     hex filename
- 912030     563    5844  918437   e03a5 busybox_old
- 912473     587    5844  918904   e0578 busybox_unstripped
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 703802f..93a3814 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -312,6 +312,8 @@ struct globals_misc {
-        /* shell level: 0 for the main shell, 1 for its children, and so on */
-        int shlvl;
- #define rootshell (!shlvl)
-+       int errlinno;
-+
-        char *minusc;  /* argument to -c option */
- 
-        char *curdir; // = nullstr;     /* current working directory */
-@@ -389,6 +391,7 @@ extern struct globals_misc *const ash_ptr_to_globals_misc;
- #define job_warning       (G_misc.job_warning)
- #define rootpid     (G_misc.rootpid    )
- #define shlvl       (G_misc.shlvl      )
-+#define errlinno    (G_misc.errlinno   )
- #define minusc      (G_misc.minusc     )
- #define curdir      (G_misc.curdir     )
- #define physdir     (G_misc.physdir    )
-@@ -723,6 +726,7 @@ union node;
- 
- struct ncmd {
-        smallint type; /* Nxxxx */
-+       int linno;
-        union node *assign;
-        union node *args;
-        union node *redirect;
-@@ -736,6 +740,7 @@ struct npipe {
- 
- struct nredir {
-        smallint type;
-+       int linno;
-        union node *n;
-        union node *redirect;
- };
-@@ -755,6 +760,7 @@ struct nif {
- 
- struct nfor {
-        smallint type;
-+       int linno;
-        union node *args;
-        union node *body;
-        char *var;
-@@ -762,6 +768,7 @@ struct nfor {
- 
- struct ncase {
-        smallint type;
-+       int linno;
-        union node *expr;
-        union node *cases;
- };
-@@ -773,6 +780,13 @@ struct nclist {
-        union node *body;
- };
- 
-+struct ndefun {
-+       smallint type;
-+       int linno;
-+       char *text;
-+       union node *body;
-+};
-+
- struct narg {
-        smallint type;
-        union node *next;
-@@ -824,6 +838,7 @@ union node {
-        struct nfor nfor;
-        struct ncase ncase;
-        struct nclist nclist;
-+       struct ndefun ndefun;
-        struct narg narg;
-        struct nfile nfile;
-        struct ndup ndup;
-@@ -1253,7 +1268,6 @@ struct parsefile {
- 
- static struct parsefile basepf;        /* top level input file */
- static struct parsefile *g_parsefile = &basepf;  /* current input file */
--static int startlinno;                 /* line # where last token started */
- static char *commandname;              /* currently executing command */
- 
- 
-@@ -1267,7 +1281,7 @@ ash_vmsg(const char *msg, va_list ap)
-                if (strcmp(arg0, commandname))
-                        fprintf(stderr, "%s: ", commandname);
-                if (!iflag || g_parsefile->pf_fd > 0)
--                       fprintf(stderr, "line %d: ", startlinno);
-+                       fprintf(stderr, "line %d: ", errlinno);
-        }
-        vfprintf(stderr, msg, ap);
-        newline_and_flush(stderr);
-@@ -1327,6 +1341,7 @@ static void raise_error_syntax(const char *) NORETURN;
- static void
- raise_error_syntax(const char *msg)
- {
-+       errlinno = g_parsefile->linno;
-        ash_msg_and_raise_error("syntax error: %s", msg);
-        /* NOTREACHED */
- }
-@@ -1993,6 +2008,9 @@ static void changepath(const char *) FAST_FUNC;
- static void change_random(const char *) FAST_FUNC;
- #endif
- 
-+static int lineno;
-+static char linenovar[sizeof("LINENO=%d") + sizeof(int)*3] = "LINENO=";
-+
- static const struct {
-        int flags;
-        const char *var_text;
-@@ -2014,6 +2032,7 @@ static const struct {
- #if ENABLE_ASH_GETOPTS
-        { VSTRFIXED|VTEXTFIXED       , defoptindvar, getoptsreset    },
- #endif
-+       { VSTRFIXED|VTEXTFIXED       , linenovar   , NULL            },
- #if ENABLE_ASH_RANDOM_SUPPORT
-        { VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM", change_random },
- #endif
-@@ -2066,12 +2085,14 @@ extern struct globals_var *const ash_ptr_to_globals_var;
- #define vps4      (&vps2)[1]
- #if ENABLE_ASH_GETOPTS
- # define voptind  (&vps4)[1]
-+# define vlineno  (&voptind)[1]
- # if ENABLE_ASH_RANDOM_SUPPORT
--#  define vrandom (&voptind)[1]
-+#  define vrandom (&vlineno)[1]
- # endif
- #else
-+# define vlineno  (&vps4)[1]
- # if ENABLE_ASH_RANDOM_SUPPORT
--#  define vrandom (&vps4)[1]
-+#  define vrandom (&vlineno)[1]
- # endif
- #endif
- 
-@@ -2209,8 +2230,12 @@ lookupvar(const char *name)
-                if (v->flags & VDYNAMIC)
-                        v->var_func(NULL);
- #endif
--               if (!(v->flags & VUNSET))
-+               if (!(v->flags & VUNSET)) {
-+                       if (v == &vlineno && v->var_text == linenovar) {
-+                               fmtstr(linenovar+7, sizeof(linenovar)-7, "%d", lineno);
-+                       }
-                        return var_end(v->var_text);
-+               }
-        }
-        return NULL;
- }
-@@ -4783,7 +4808,7 @@ cmdtxt(union node *n)
-                p = "; done";
-                goto dodo;
-        case NDEFUN:
--               cmdputs(n->narg.text);
-+               cmdputs(n->ndefun.text);
-                p = "() { ... }";
-                goto dotail2;
-        case NCMD:
-@@ -8551,6 +8576,9 @@ calcsize(int funcblocksize, union node *n)
-                funcblocksize = calcsize(funcblocksize, n->nclist.next);
-                break;
-        case NDEFUN:
-+               funcblocksize = calcsize(funcblocksize, n->ndefun.body);
-+               funcblocksize += SHELL_ALIGN(strlen(n->ndefun.text) + 1);
-+               break;
-        case NARG:
-                funcblocksize = sizenodelist(funcblocksize, n->narg.backquote);
-                funcblocksize += SHELL_ALIGN(strlen(n->narg.text) + 1); /* was funcstringsize += ... */
-@@ -8626,6 +8654,7 @@ copynode(union node *n)
-                new->ncmd.redirect = copynode(n->ncmd.redirect);
-                new->ncmd.args = copynode(n->ncmd.args);
-                new->ncmd.assign = copynode(n->ncmd.assign);
-+               new->ncmd.linno = n->ncmd.linno;
-                break;
-        case NPIPE:
-                new->npipe.cmdlist = copynodelist(n->npipe.cmdlist);
-@@ -8636,6 +8665,7 @@ copynode(union node *n)
-        case NSUBSHELL:
-                new->nredir.redirect = copynode(n->nredir.redirect);
-                new->nredir.n = copynode(n->nredir.n);
-+               new->nredir.linno = n->nredir.linno;
-                break;
-        case NAND:
-        case NOR:
-@@ -8654,10 +8684,12 @@ copynode(union node *n)
-                new->nfor.var = nodeckstrdup(n->nfor.var);
-                new->nfor.body = copynode(n->nfor.body);
-                new->nfor.args = copynode(n->nfor.args);
-+               new->nfor.linno = n->nfor.linno;
-                break;
-        case NCASE:
-                new->ncase.cases = copynode(n->ncase.cases);
-                new->ncase.expr = copynode(n->ncase.expr);
-+               new->ncase.linno = n->ncase.linno;
-                break;
-        case NCLIST:
-                new->nclist.body = copynode(n->nclist.body);
-@@ -8665,6 +8697,10 @@ copynode(union node *n)
-                new->nclist.next = copynode(n->nclist.next);
-                break;
-        case NDEFUN:
-+               new->ndefun.body = copynode(n->ndefun.body);
-+               new->ndefun.text = nodeckstrdup(n->ndefun.text);
-+               new->ndefun.linno = n->ndefun.linno;
-+               break;
-        case NARG:
-                new->narg.backquote = copynodelist(n->narg.backquote);
-                new->narg.text = nodeckstrdup(n->narg.text);
-@@ -8733,7 +8769,7 @@ defun(union node *func)
-        INT_OFF;
-        entry.cmdtype = CMDFUNCTION;
-        entry.u.func = copyfunc(func);
--       addcmdentry(func->narg.text, &entry);
-+       addcmdentry(func->ndefun.text, &entry);
-        INT_ON;
- }
- 
-@@ -8743,8 +8779,8 @@ defun(union node *func)
- #define SKIPFUNC       (1 << 2)
- static smallint evalskip;       /* set to SKIPxxx if we are skipping commands */
- static int skipcount;           /* number of levels to skip */
--static int funcnest;            /* depth of function calls */
- static int loopnest;            /* current loop nesting level */
-+static int funcline;            /* starting line number of current function, or 0 if not in a function */
- 
- /* Forward decl way out to parsing code - dotrap needs it */
- static int evalstring(char *s, int flags);
-@@ -8839,6 +8875,9 @@ evaltree(union node *n, int flags)
-                status = !evaltree(n->nnot.com, EV_TESTED);
-                goto setstatus;
-        case NREDIR:
-+               errlinno = lineno = n->nredir.linno;
-+               if (funcline)
-+                       lineno -= funcline - 1;
-                expredir(n->nredir.redirect);
-                pushredir(n->nredir.redirect);
-                status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
-@@ -8993,6 +9032,10 @@ evalfor(union node *n, int flags)
-        struct stackmark smark;
-        int status = 0;
- 
-+       errlinno = lineno = n->ncase.linno;
-+       if (funcline)
-+               lineno -= funcline - 1;
-+
-        setstackmark(&smark);
-        arglist.list = NULL;
-        arglist.lastp = &arglist.list;
-@@ -9024,6 +9067,10 @@ evalcase(union node *n, int flags)
-        struct stackmark smark;
-        int status = 0;
- 
-+       errlinno = lineno = n->ncase.linno;
-+       if (funcline)
-+               lineno -= funcline - 1;
-+
-        setstackmark(&smark);
-        arglist.list = NULL;
-        arglist.lastp = &arglist.list;
-@@ -9058,6 +9105,10 @@ evalsubshell(union node *n, int flags)
-        int backgnd = (n->type == NBACKGND); /* FORK_BG(1) if yes, else FORK_FG(0) */
-        int status;
- 
-+       errlinno = lineno = n->nredir.linno;
-+       if (funcline)
-+               lineno -= funcline - 1;
-+
-        expredir(n->nredir.redirect);
-        if (!backgnd && (flags & EV_EXIT) && !may_have_traps)
-                goto nofork;
-@@ -9365,8 +9416,10 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
-        struct jmploc *volatile savehandler;
-        struct jmploc jmploc;
-        int e;
-+       int savefuncline;
- 
-        saveparam = shellparam;
-+       savefuncline = funcline;
-        savehandler = exception_handler;
-        e = setjmp(jmploc.loc);
-        if (e) {
-@@ -9376,7 +9429,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
-        exception_handler = &jmploc;
-        shellparam.malloced = 0;
-        func->count++;
--       funcnest++;
-+       funcline = func->n.ndefun.linno;
-        INT_ON;
-        shellparam.nparam = argc - 1;
-        shellparam.p = argv + 1;
-@@ -9385,11 +9438,11 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
-        shellparam.optoff = -1;
- #endif
-        pushlocalvars();
--       evaltree(func->n.narg.next, flags & EV_TESTED);
-+       evaltree(func->n.ndefun.body, flags & EV_TESTED);
-        poplocalvars(0);
-  funcdone:
-        INT_OFF;
--       funcnest--;
-+       funcline = savefuncline;
-        freefunc(func);
-        freeparam(&shellparam);
-        shellparam = saveparam;
-@@ -9753,6 +9806,10 @@ evalcommand(union node *cmd, int flags)
-        char **nargv;
-        smallint cmd_is_exec;
- 
-+       errlinno = lineno = cmd->ncmd.linno;
-+       if (funcline)
-+               lineno -= funcline - 1;
-+
-        /* First expand the arguments. */
-        TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
-        setstackmark(&smark);
-@@ -9798,7 +9855,7 @@ evalcommand(union node *cmd, int flags)
-        *nargv = NULL;
- 
-        lastarg = NULL;
--       if (iflag && funcnest == 0 && argc > 0)
-+       if (iflag && funcline == 0 && argc > 0)
-                lastarg = nargv[-1];
- 
-        expredir(cmd->ncmd.redirect);
-@@ -11317,6 +11374,7 @@ simplecmd(void)
-        union node *vars, **vpp;
-        union node **rpp, *redir;
-        int savecheckkwd;
-+       int savelinno;
- #if BASH_TEST2
-        smallint double_brackets_flag = 0;
- #endif
-@@ -11330,6 +11388,7 @@ simplecmd(void)
-        rpp = &redir;
- 
-        savecheckkwd = CHKALIAS;
-+       savelinno = g_parsefile->linno;
-        for (;;) {
-                int t;
-                checkkwd = savecheckkwd;
-@@ -11419,7 +11478,9 @@ simplecmd(void)
-                                }
-                                n->type = NDEFUN;
-                                checkkwd = CHKNL | CHKKWD | CHKALIAS;
--                               n->narg.next = parse_command();
-+                               n->ndefun.text = n->narg.text;
-+                               n->ndefun.linno = g_parsefile->linno;
-+                               n->ndefun.body = parse_command();
-                                return n;
-                        }
-                        IF_BASH_FUNCTION(function_flag = 0;)
-@@ -11435,6 +11496,7 @@ simplecmd(void)
-        *rpp = NULL;
-        n = stzalloc(sizeof(struct ncmd));
-        n->type = NCMD;
-+       n->ncmd.linno = savelinno;
-        n->ncmd.args = args;
-        n->ncmd.assign = vars;
-        n->ncmd.redirect = redir;
-@@ -11450,10 +11512,13 @@ parse_command(void)
-        union node *redir, **rpp;
-        union node **rpp2;
-        int t;
-+       int savelinno;
- 
-        redir = NULL;
-        rpp2 = &redir;
- 
-+       savelinno = g_parsefile->linno;
-+
-        switch (readtoken()) {
-        default:
-                raise_error_unexpected_syntax(-1);
-@@ -11504,6 +11569,7 @@ parse_command(void)
-                        raise_error_syntax("bad for loop variable");
-                n1 = stzalloc(sizeof(struct nfor));
-                n1->type = NFOR;
-+               n1->nfor.linno = savelinno;
-                n1->nfor.var = wordtext;
-                checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                if (readtoken() == TIN) {
-@@ -11544,6 +11610,7 @@ parse_command(void)
-        case TCASE:
-                n1 = stzalloc(sizeof(struct ncase));
-                n1->type = NCASE;
-+               n1->ncase.linno = savelinno;
-                if (readtoken() != TWORD)
-                        raise_error_unexpected_syntax(TWORD);
-                n1->ncase.expr = n2 = stzalloc(sizeof(struct narg));
-@@ -11595,6 +11662,7 @@ parse_command(void)
-        case TLP:
-                n1 = stzalloc(sizeof(struct nredir));
-                n1->type = NSUBSHELL;
-+               n1->nredir.linno = savelinno;
-                n1->nredir.n = list(0);
-                /*n1->nredir.redirect = NULL; - stzalloc did it */
-                t = TRP;
-@@ -11628,6 +11696,7 @@ parse_command(void)
-                if (n1->type != NSUBSHELL) {
-                        n2 = stzalloc(sizeof(struct nredir));
-                        n2->type = NREDIR;
-+                       n2->nredir.linno = savelinno;
-                        n2->nredir.n = n1;
-                        n1 = n2;
-                }
-@@ -11726,10 +11795,8 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
-        IF_FEATURE_SH_MATH(int arinest;)    /* levels of arithmetic expansion */
-        IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */
-        int dqvarnest;       /* levels of variables expansion within double quotes */
--
-        IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;)
- 
--       startlinno = g_parsefile->linno;
-        bqlist = NULL;
-        quotef = 0;
-        IF_FEATURE_SH_MATH(prevsyntax = 0;)
-@@ -11906,7 +11973,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
-        if (syntax != BASESYNTAX && eofmark == NULL)
-                raise_error_syntax("unterminated quoted string");
-        if (varnest != 0) {
--               startlinno = g_parsefile->linno;
-                /* { */
-                raise_error_syntax("missing '}'");
-        }
-@@ -12298,7 +12364,6 @@ parsebackq: {
- 
-                        case PEOF:
-                        IF_ASH_ALIAS(case PEOA:)
--                               startlinno = g_parsefile->linno;
-                                raise_error_syntax("EOF in backquote substitution");
- 
-                        case '\n':
-@@ -12380,8 +12445,6 @@ parsearith: {
-  *      quoted.
-  * If the token is TREDIR, then we set redirnode to a structure containing
-  *      the redirection.
-- * In all cases, the variable startlinno is set to the number of the line
-- *      on which the token starts.
-  *
-  * [Change comment:  here documents and internal procedures]
-  * [Readtoken shouldn't have any arguments.  Perhaps we should make the
-@@ -12419,7 +12482,6 @@ xxreadtoken(void)
-                return lasttoken;
-        }
-        setprompt_if(needprompt, 2);
--       startlinno = g_parsefile->linno;
-        for (;;) {                      /* until token or start of word found */
-                c = pgetc();
-                if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
-@@ -12480,7 +12542,6 @@ xxreadtoken(void)
-                return lasttoken;
-        }
-        setprompt_if(needprompt, 2);
--       startlinno = g_parsefile->linno;
-        for (;;) {      /* until token or start of word found */
-                c = pgetc();
-                switch (c) {
diff --git a/shell/ash_test/ash-arith/arith-postinc.right b/shell/ash_test/ash-arith/arith-postinc.right
new file mode 100644
index 000000000..c95ce02bf
--- /dev/null
+++ b/shell/ash_test/ash-arith/arith-postinc.right
@@ -0,0 +1,5 @@
+1 1
+1 1
+1 1
+1 1
+Ok:0
diff --git a/shell/ash_test/ash-arith/arith-postinc.tests b/shell/ash_test/ash-arith/arith-postinc.tests
new file mode 100755
index 000000000..3fd9bfed5
--- /dev/null
+++ b/shell/ash_test/ash-arith/arith-postinc.tests
@@ -0,0 +1,5 @@
+echo 1 $((0++1))
+echo 1 $((0--1))
+x=-1; echo 1 $((0-$x))
+x=+1; echo 1 $((0+$x))
+echo Ok:$?
diff --git a/shell/ash_test/ash-arith/arith.right b/shell/ash_test/ash-arith/arith.right
index 9b9ca8e2f..6936f1269 100644
--- a/shell/ash_test/ash-arith/arith.right
+++ b/shell/ash_test/ash-arith/arith.right
@@ -126,6 +126,10 @@ ghi
 ./arith2.sub: line 5: arithmetic syntax error
 5 5
 1 1
+6 6
+2 2
+3 3
+1 1
 4 4
 0 0
 ./arith2.sub: line 42: arithmetic syntax error
diff --git a/shell/ash_test/ash-arith/arith2.sub b/shell/ash_test/ash-arith/arith2.sub
index f7e3c9235..9105059db 100755
--- a/shell/ash_test/ash-arith/arith2.sub
+++ b/shell/ash_test/ash-arith/arith2.sub
@@ -23,14 +23,14 @@
 echo 5 $(( 4 + ++a ))
 echo 1 $a
 
-# ash doesn't handle it right...
-#ash# echo 6 $(( 4+++a ))
-#ash# echo 2 $a
+# this is treated as 4 + ++a
+echo 6 $(( 4+++a ))
+echo 2 $a
       a=2
 
-# ash doesn't handle it right...
-#ash# echo 3 $(( 4---a ))
-#ash# echo 1 $a
+# this is treated as 4 - --a
+echo 3 $(( 4---a ))
+echo 1 $a
       a=1
 
 echo 4 $(( 4 - -- a ))
diff --git a/shell/ash_test/ash-misc/control_char1.right b/shell/ash_test/ash-misc/control_char1.right
new file mode 100644
index 000000000..6f8c2533c
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char1.right
@@ -0,0 +1,3 @@
+
+b#c
+Done:0
diff --git a/shell/ash_test/ash-misc/control_char1.tests b/shell/ash_test/ash-misc/control_char1.tests
new file mode 100755
index 000000000..0cfe60141
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char1.tests
@@ -0,0 +1,3 @@
+echo 
+echo 'b#c'
+echo Done:$?
diff --git a/shell/ash_test/ash-misc/control_char2.right b/shell/ash_test/ash-misc/control_char2.right
new file mode 100644
index 000000000..9498b420d
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char2.right
@@ -0,0 +1,2 @@
+
+Done:0
diff --git a/shell/ash_test/ash-misc/control_char2.tests b/shell/ash_test/ash-misc/control_char2.tests
new file mode 100755
index 000000000..e77d7a1a6
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char2.tests
@@ -0,0 +1,3 @@
+c=`printf '\3'`
+eval "echo $c"
+echo Done:$?
diff --git a/shell/ash_test/ash-misc/for_with_bslashes.right b/shell/ash_test/ash-misc/for_with_bslashes.right
index 02d96692c..cd8501050 100644
--- a/shell/ash_test/ash-misc/for_with_bslashes.right
+++ b/shell/ash_test/ash-misc/for_with_bslashes.right
@@ -5,4 +5,5 @@ b"c
 b'c
 b$c
 b`true`c
+b#c
 Zero:0
diff --git a/shell/ash_test/ash-misc/for_with_bslashes.tests b/shell/ash_test/ash-misc/for_with_bslashes.tests
index 363f3d85b..8acd9808a 100755
--- a/shell/ash_test/ash-misc/for_with_bslashes.tests
+++ b/shell/ash_test/ash-misc/for_with_bslashes.tests
@@ -1,9 +1,5 @@
-# UNFIXED BUG.
-# commented-out words contain ^C character.
-# It's a SPECIAL_VAR_SYMBOL, for now hush does not escape it.
-# When it is fixed, update this test.
-
-for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' ### 'b#c'
+# last word contains ^C character.
+for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b#c'
 do
     echo $a
 done
diff --git a/shell/ash_test/ash-psubst/emptytick.right b/shell/ash_test/ash-psubst/emptytick.right
index 7629deba6..459c4f735 100644
--- a/shell/ash_test/ash-psubst/emptytick.right
+++ b/shell/ash_test/ash-psubst/emptytick.right
@@ -1,8 +1,8 @@
 0
 0
-./emptytick.tests: line 3: : Permission denied
+./emptytick.tests: line 1: : Permission denied
 127
-./emptytick.tests: line 4: : Permission denied
+./emptytick.tests: line 1: : Permission denied
 127
 0
 0
diff --git a/shell/ash_test/ash-quoting/mode_x.right b/shell/ash_test/ash-quoting/mode_x.right
index c2dd3550c..d1f670af6 100644
--- a/shell/ash_test/ash-quoting/mode_x.right
+++ b/shell/ash_test/ash-quoting/mode_x.right
@@ -3,8 +3,8 @@
 + true '%s\n' one 'two '"'"'three' four
 + this=command
 + 'this=command'
-./mode_x.tests: line 1: this=command: not found
+./mode_x.tests: line 10: this=command: not found
 + true
 + true
 + 'if' true
-./mode_x.tests: line 1: if: not found
+./mode_x.tests: line 14: if: not found
diff --git a/shell/ash_test/ash-vars/param_expand_bash_substring.right b/shell/ash_test/ash-vars/param_expand_bash_substring.right
index 9ad6dbcad..687dd9002 100644
--- a/shell/ash_test/ash-vars/param_expand_bash_substring.right
+++ b/shell/ash_test/ash-vars/param_expand_bash_substring.right
@@ -3,6 +3,7 @@ SHELL: line 1: syntax error: bad substitution
 SHELL: line 1: syntax error: bad substitution
 SHELL: line 1: syntax error: bad substitution
 SHELL: line 1: syntax error: missing '}'
+0
 1    =||
 1:1  =||
 1:1:2=||
diff --git a/shell/ash_test/ash-vars/param_expand_bash_substring.tests b/shell/ash_test/ash-vars/param_expand_bash_substring.tests
index cce9f123e..512da351b 100755
--- a/shell/ash_test/ash-vars/param_expand_bash_substring.tests
+++ b/shell/ash_test/ash-vars/param_expand_bash_substring.tests
@@ -11,7 +11,7 @@ export var=0123456789
 "$THIS_SH" -c 'echo ${var:}' SHELL
 
 # then some funky ones
-# UNFIXED BUG: this should work: "$THIS_SH" -c 'echo ${?:0}'
+"$THIS_SH" -c 'echo ${?:0}' SHELL
 
 # now some valid ones
 set --; echo "1    =|${1}|"
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.right b/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.right
new file mode 100644
index 000000000..d400a7e31
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.right
@@ -0,0 +1,2 @@
+v
+Ok:0
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.tests b/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.tests
new file mode 100755
index 000000000..6e8aa2afa
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_pattern.tests
@@ -0,0 +1,3 @@
+v=v
+echo ${v//}
+echo Ok:$?
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_var.right b/shell/ash_test/ash-vars/var_bash_repl_empty_var.right
new file mode 100644
index 000000000..892916783
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_var.right
@@ -0,0 +1,2 @@
+
+Ok:0
diff --git a/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests b/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests
new file mode 100755
index 000000000..73a43d38e
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash_repl_empty_var.tests
@@ -0,0 +1,3 @@
+v=''
+echo ${v/*/w}
+echo Ok:$?
diff --git a/shell/hush.c b/shell/hush.c
index 708555ac4..8f1017e3c 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -47,17 +47,13 @@
  *      follow IFS rules more precisely, including update semantics
  *      tilde expansion
  *      aliases
- *      builtins mandated by standards we don't support:
- *          [un]alias, command, fc:
- *          command -v CMD: print "/path/to/CMD"
- *              prints "CMD" for builtins
- *              prints "alias ALIAS='EXPANSION'" for aliases
- *              prints nothing and sets $? to 1 if not found
- *          command -V CMD: print "CMD is /path/CMD|a shell builtin|etc"
- *          command [-p] CMD: run CMD, even if a function CMD also exists
- *              (can use this to override standalone shell as well)
- *              -p: use default $PATH
+ *      "command" missing features:
+ *          command -p CMD: run CMD using default $PATH
+ *              (can use this to override standalone shell as well?)
  *          command BLTIN: disables special-ness (e.g. errors do not abort)
+ *          command -V CMD1 CMD2 CMD3 (multiple args) (not in standard)
+ *      builtins mandated by standards we don't support:
+ *          [un]alias, fc:
  *          fc -l[nr] [BEG] [END]: list range of commands in history
  *          fc [-e EDITOR] [BEG] [END]: edit/rerun range of commands
  *          fc -s [PAT=REP] [CMD]: rerun CMD, replacing PAT with REP
@@ -124,6 +120,18 @@
 //config:       help
 //config:       Enable {abc,def} extension.
 //config:
+//config:config HUSH_LINENO_VAR
+//config:       bool "$LINENO variable"
+//config:       default y
+//config:       depends on HUSH_BASH_COMPAT
+//config:
+//config:config HUSH_BASH_SOURCE_CURDIR
+//config:       bool "'source' and '.' builtins search current directory after $PATH"
+//config:       default n   # do not encourage non-standard behavior
+//config:       depends on HUSH_BASH_COMPAT
+//config:       help
+//config:       This is not compliant with standards. Avoid if possible.
+//config:
 //config:config HUSH_INTERACTIVE
 //config:       bool "Interactive mode"
 //config:       default y
@@ -253,6 +261,11 @@
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:
+//config:config HUSH_COMMAND
+//config:       bool "command builtin"
+//config:       default y
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
+//config:
 //config:config HUSH_TRAP
 //config:       bool "trap builtin"
 //config:       default y
@@ -462,7 +475,10 @@
 # define MINUS_PLUS_EQUAL_QUESTION ("%#:-=+?" + 3)
 #endif
 
-#define SPECIAL_VAR_SYMBOL   3
+#define SPECIAL_VAR_SYMBOL_STR "\3"
+#define SPECIAL_VAR_SYMBOL       3
+/* The "variable" with name "\1" emits string "\3". Testcase: "echo ^C" */
+#define SPECIAL_VAR_QUOTED_SVS   1
 
 struct variable;
 
@@ -608,6 +624,9 @@ typedef enum redir_type {
 struct command {
         pid_t pid;                  /* 0 if exited */
         int assignment_cnt;         /* how many argv[i] are assignments? */
+#if ENABLE_HUSH_LINENO_VAR
+        unsigned lineno;
+#endif
         smallint cmd_type;          /* CMD_xxx */
 #define CMD_NORMAL   0
 #define CMD_SUBSHELL 1
@@ -927,6 +946,10 @@ struct globals {
         unsigned handled_SIGCHLD;
         smallint we_have_children;
 #endif
+#if ENABLE_HUSH_LINENO_VAR
+        unsigned lineno;
+        char *lineno_var;
+#endif
         struct FILE_list *FILE_list;
         /* Which signals have non-DFL handler (even with no traps set)?
          * Set at the start to:
@@ -1924,7 +1947,7 @@ static void hush_exit(int exitcode)
         if (G.exiting <= 0 && G_traps && G_traps[0] && G_traps[0][0]) {
                 char *argv[3];
                 /* argv[0] is unused */
-                argv[1] = G_traps[0];
+                argv[1] = xstrdup(G_traps[0]); /* copy, since EXIT trap handler may modify G_traps[0] */
                 argv[2] = NULL;
                 G.exiting = 1; /* prevent EXIT trap recursion */
                 /* Note: G_traps[0] is not cleared!
@@ -1985,10 +2008,12 @@ static int check_and_run_traps(void)
                                 smalluint save_rcode;
                                 char *argv[3];
                                 /* argv[0] is unused */
-                                argv[1] = G_traps[sig];
+                                argv[1] = xstrdup(G_traps[sig]);
+                                /* why strdup? trap can modify itself: trap 'trap "echo oops" INT' INT */
                                 argv[2] = NULL;
                                 save_rcode = G.last_exitcode;
                                 builtin_eval(argv);
+                                free(argv[1]);
 //FIXME: shouldn't it be set to 128 + sig instead?
                                 G.last_exitcode = save_rcode;
                                 last_sig = sig;
@@ -2131,6 +2156,13 @@ static int set_local_var(char *str, unsigned flags)
         }
 
         name_len = eq_sign - str + 1; /* including '=' */
+#if ENABLE_HUSH_LINENO_VAR
+        if (G.lineno_var) {
+                if (name_len == 7 && strncmp("LINENO", str, 6) == 0)
+                        G.lineno_var = NULL;
+        }
+#endif
+
         var_pp = &G.top_var;
         while ((cur = *var_pp) != NULL) {
                 if (strncmp(cur->varstr, str, name_len) != 0) {
@@ -2252,10 +2284,16 @@ static int unset_local_var_len(const char *name, int name_len)
 
         if (!name)
                 return EXIT_SUCCESS;
+
 #if ENABLE_HUSH_GETOPTS
         if (name_len == 6 && strncmp(name, "OPTIND", 6) == 0)
                 G.getopt_count = 0;
 #endif
+#if ENABLE_HUSH_LINENO_VAR
+        if (name_len == 6 && G.lineno_var && strncmp(name, "LINENO", 6) == 0)
+                G.lineno_var = NULL;
+#endif
+
         var_pp = &G.top_var;
         while ((cur = *var_pp) != NULL) {
                 if (strncmp(cur->varstr, name, name_len) == 0 && cur->varstr[name_len] == '=') {
@@ -2278,7 +2316,7 @@ static int unset_local_var_len(const char *name, int name_len)
         return EXIT_SUCCESS;
 }
 
-#if ENABLE_HUSH_UNSET
+#if ENABLE_HUSH_UNSET || ENABLE_HUSH_GETOPTS
 static int unset_local_var(const char *name)
 {
         return unset_local_var_len(name, strlen(name));
@@ -2300,7 +2338,7 @@ static void unset_vars(char **strings)
         free(strings);
 }
 
-#if BASH_HOSTNAME_VAR || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_READ
+#if BASH_HOSTNAME_VAR || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_READ || ENABLE_HUSH_GETOPTS
 static void FAST_FUNC set_local_var_from_halves(const char *name, const char *val)
 {
         char *var = xasprintf("%s=%s", name, val);
@@ -2574,6 +2612,12 @@ static int i_getch(struct in_str *i)
  out:
         debug_printf("file_get: got '%c' %d\n", ch, ch);
         i->last_char = ch;
+#if ENABLE_HUSH_LINENO_VAR
+        if (ch == '\n') {
+                G.lineno++;
+                debug_printf_parse("G.lineno++ = %u\n", G.lineno);
+        }
+#endif
         return ch;
 }
 
@@ -3374,8 +3418,13 @@ static void debug_print_tree(struct pipe *pi, int lvl)
 
         pin = 0;
         while (pi) {
-                fdprintf(2, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
-                                pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]);
+                fdprintf(2, "%*spipe %d %sres_word=%s followup=%d %s\n",
+                                lvl*2, "",
+                                pin,
+                                (IF_HAS_KEYWORDS(pi->pi_inverted ? "! " :) ""),
+                                RES[pi->res_word],
+                                pi->followup, PIPE[pi->followup]
+                );
                 prn = 0;
                 while (prn < pi->num_cmds) {
                         struct command *command = &pi->cmds[prn];
@@ -3384,6 +3433,9 @@ static void debug_print_tree(struct pipe *pi, int lvl)
                         fdprintf(2, "%*s cmd %d assignment_cnt:%d",
                                         lvl*2, "", prn,
                                         command->assignment_cnt);
+#if ENABLE_HUSH_LINENO_VAR
+                        fdprintf(2, " LINENO:%u", command->lineno);
+#endif
                         if (command->group) {
                                 fdprintf(2, " group %s: (argv=%p)%s%s\n",
                                                 CMDTYPE[command->cmd_type],
@@ -3456,6 +3508,10 @@ static int done_command(struct parse_context *ctx)
         ctx->command = command = &pi->cmds[pi->num_cmds];
  clear_and_ret:
         memset(command, 0, sizeof(*command));
+#if ENABLE_HUSH_LINENO_VAR
+        command->lineno = G.lineno;
+        debug_printf_parse("command->lineno = G.lineno (%u)\n", G.lineno);
+#endif
         return pi->num_cmds; /* used only for 0/nonzero check */
 }
 
@@ -3643,9 +3699,9 @@ static const struct reserved_combo* match_reserved_word(o_string *word)
         }
         return NULL;
 }
-/* Return 0: not a keyword, 1: keyword
+/* Return NULL: not a keyword, else: keyword
  */
-static int reserved_word(o_string *word, struct parse_context *ctx)
+static const struct reserved_combo* reserved_word(o_string *word, struct parse_context *ctx)
 {
 # if ENABLE_HUSH_CASE
         static const struct reserved_combo reserved_match = {
@@ -3658,7 +3714,7 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
                 return 0;
         r = match_reserved_word(word);
         if (!r)
-                return 0;
+                return r; /* NULL */
 
         debug_printf("found reserved word %s, res %d\n", r->literal, r->res);
 # if ENABLE_HUSH_CASE
@@ -3673,7 +3729,7 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
                         ctx->ctx_res_w = RES_SNTX;
                 }
                 ctx->ctx_inverted = 1;
-                return 1;
+                return r;
         }
         if (r->flag & FLAG_START) {
                 struct parse_context *old;
@@ -3685,7 +3741,7 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
         } else if (/*ctx->ctx_res_w == RES_NONE ||*/ !(ctx->old_flag & (1 << r->res))) {
                 syntax_error_at(word->data);
                 ctx->ctx_res_w = RES_SNTX;
-                return 1;
+                return r;
         } else {
                 /* "{...} fi" is ok. "{...} if" is not
                  * Example:
@@ -3735,7 +3791,7 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
                 *ctx = *old;   /* physical copy */
                 free(old);
         }
-        return 1;
+        return r;
 }
 #endif /* HAS_KEYWORDS */
 
@@ -3801,9 +3857,26 @@ static int done_word(o_string *word, struct parse_context *ctx)
                  && ctx->ctx_res_w != RES_CASE
 # endif
                 ) {
-                        int reserved = reserved_word(word, ctx);
-                        debug_printf_parse("checking for reserved-ness: %d\n", reserved);
+                        const struct reserved_combo *reserved;
+                        reserved = reserved_word(word, ctx);
+                        debug_printf_parse("checking for reserved-ness: %d\n", !!reserved);
                         if (reserved) {
+# if ENABLE_HUSH_LINENO_VAR
+/* Case:
+ * "while ...; do
+ *      cmd ..."
+ * If we don't close the pipe _now_, immediately after "do", lineno logic
+ * sees "cmd" as starting at "do" - i.e., at the previous line.
+ */
+                                if (0
+                                 IF_HUSH_IF(|| reserved->res == RES_THEN)
+                                 IF_HUSH_IF(|| reserved->res == RES_ELIF)
+                                 IF_HUSH_IF(|| reserved->res == RES_ELSE)
+                                 IF_HUSH_LOOPS(|| reserved->res == RES_DO)
+                                ) {
+                                        done_pipe(ctx, PIPE_SEQ);
+                                }
+# endif
                                 o_reset_to_empty_unquoted(word);
                                 debug_printf_parse("done_word return %d\n",
                                                 (ctx->ctx_res_w == RES_SNTX));
@@ -3840,21 +3913,6 @@ static int done_word(o_string *word, struct parse_context *ctx)
                         word->o_assignment = MAYBE_ASSIGNMENT;
                 }
                 debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
-
-                if (word->has_quoted_part
-                 /* optimization: and if it's ("" or '') or ($v... or `cmd`...): */
-                 && (word->data[0] == '\0' || word->data[0] == SPECIAL_VAR_SYMBOL)
-                 /* (otherwise it's known to be not empty and is already safe) */
-                ) {
-                        /* exclude "$@" - it can expand to no word despite "" */
-                        char *p = word->data;
-                        while (p[0] == SPECIAL_VAR_SYMBOL
-                            && (p[1] & 0x7f) == '@'
-                            && p[2] == SPECIAL_VAR_SYMBOL
-                        ) {
-                                p += 3;
-                        }
-                }
                 command->argv = add_string_to_strings(command->argv, xstrdup(word->data));
                 debug_print_strings("word appended to argv", command->argv);
         }
@@ -4503,9 +4561,10 @@ static int parse_dollar(o_string *as_string,
 
         debug_printf_parse("parse_dollar entered: ch='%c'\n", ch);
         if (isalpha(ch)) {
+ make_var:
                 ch = i_getch(input);
                 nommu_addchr(as_string, ch);
- make_var:
+ /*make_var1:*/
                 o_addchr(dest, SPECIAL_VAR_SYMBOL);
                 while (1) {
                         debug_printf_parse(": '%c'\n", ch);
@@ -4698,19 +4757,22 @@ static int parse_dollar(o_string *as_string,
         }
 #endif
         case '_':
+                goto make_var;
+#if 0
+        /* TODO: $_ and $-: */
+        /* $_ Shell or shell script name; or last argument of last command
+         * (if last command wasn't a pipe; if it was, bash sets $_ to "");
+         * but in command's env, set to full pathname used to invoke it */
+        /* $- Option flags set by set builtin or shell options (-i etc) */
                 ch = i_getch(input);
                 nommu_addchr(as_string, ch);
                 ch = i_peek_and_eat_bkslash_nl(input);
                 if (isalnum(ch)) { /* it's $_name or $_123 */
                         ch = '_';
-                        goto make_var;
+                        goto make_var1;
                 }
                 /* else: it's $_ */
-        /* TODO: $_ and $-: */
-        /* $_ Shell or shell script name; or last argument of last command
-         * (if last command wasn't a pipe; if it was, bash sets $_ to "");
-         * but in command's env, set to full pathname used to invoke it */
-        /* $- Option flags set by set builtin or shell options (-i etc) */
+#endif
         default:
                 o_addQchr(dest, '$');
         }
@@ -4914,7 +4976,8 @@ static struct pipe *parse_stream(char **pstring,
                         next = i_peek(input);
 
                 is_special = "{}<>;&|()#'" /* special outside of "str" */
-                                "\\$\"" IF_HUSH_TICK("`"); /* always special */
+                                "\\$\"" IF_HUSH_TICK("`") /* always special */
+                                SPECIAL_VAR_SYMBOL_STR;
                 /* Are { and } special here? */
                 if (ctx.command->argv /* word [word]{... - non-special */
                  || dest.length       /* word{... - non-special */
@@ -4948,6 +5011,22 @@ static struct pipe *parse_stream(char **pstring,
                 }
 
                 if (is_blank) {
+#if ENABLE_HUSH_LINENO_VAR
+/* Case:
+ * "while ...; do<whitespace><newline>
+ *      cmd ..."
+ * would think that "cmd" starts in <whitespace> -
+ * i.e., at the previous line.
+ * We need to skip all whitespace before newlines.
+ */
+                        while (ch != '\n') {
+                                next = i_peek(input);
+                                if (next != ' ' && next != '\t' && next != '\n')
+                                        break; /* next char is not ws */
+                                ch = i_getch(input);
+                        }
+                        /* ch == last eaten whitespace char */
+#endif
                         if (done_word(&dest, &ctx)) {
                                 goto parse_error;
                         }
@@ -5186,8 +5265,14 @@ static struct pipe *parse_stream(char **pstring,
                 /* Note: nommu_addchr(&ctx.as_string, ch) is already done */
 
                 switch (ch) {
-                case '#': /* non-comment #: "echo a#b" etc */
-                        o_addQchr(&dest, ch);
+                case SPECIAL_VAR_SYMBOL:
+                        /* Convert raw ^C to corresponding special variable reference */
+                        o_addchr(&dest, SPECIAL_VAR_SYMBOL);
+                        o_addchr(&dest, SPECIAL_VAR_QUOTED_SVS);
+                        /* fall through */
+                case '#':
+                        /* non-comment #: "echo a#b" etc */
+                        o_addchr(&dest, ch);
                         break;
                 case '\\':
                         if (next == EOF) {
@@ -5229,6 +5314,11 @@ static struct pipe *parse_stream(char **pstring,
                                         nommu_addchr(&ctx.as_string, ch);
                                         if (ch == '\'')
                                                 break;
+                                        if (ch == SPECIAL_VAR_SYMBOL) {
+                                                /* Convert raw ^C to corresponding special variable reference */
+                                                o_addchr(&dest, SPECIAL_VAR_SYMBOL);
+                                                o_addchr(&dest, SPECIAL_VAR_QUOTED_SVS);
+                                        }
                                         o_addqchr(&dest, ch);
                                 }
                         }
@@ -5534,7 +5624,7 @@ static int expand_on_ifs(int *ended_with_ifs, o_string *output, int n, const cha
 static char *encode_then_expand_string(const char *str, int process_bkslash, int do_unbackslash)
 {
 #if !BASH_PATTERN_SUBST
-        const int do_unbackslash = 1;
+        enum { do_unbackslash = 1 };
 #endif
         char *exp_str;
         struct in_str input;
@@ -5610,6 +5700,10 @@ static char *replace_pattern(char *val, const char *pattern, const char *repl, c
         unsigned res_len = 0;
         unsigned repl_len = strlen(repl);
 
+        /* Null pattern never matches, including if "var" is empty */
+        if (!pattern[0])
+                return result; /* NULL, no replaces happened */
+
         while (1) {
                 int size;
                 char *s = strstr_pattern(val, pattern, &size);
@@ -5640,9 +5734,9 @@ static char *replace_pattern(char *val, const char *pattern, const char *repl, c
  */
 static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, char **pp)
 {
-        const char *val = NULL;
-        char *to_be_freed = NULL;
-        char *p = *pp;
+        const char *val;
+        char *to_be_freed;
+        char *p;
         char *var;
         char first_char;
         char exp_op;
@@ -5651,6 +5745,9 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
         char *exp_word = exp_word; /* for compiler */
         char arg0;
 
+        val = NULL;
+        to_be_freed = NULL;
+        p = *pp;
         *p = '\0'; /* replace trailing SPECIAL_VAR_SYMBOL */
         var = arg;
         exp_saveptr = arg[1] ? strchr(VAR_ENCODED_SUBST_OPS, arg[1]) : NULL;
@@ -5773,8 +5870,6 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                          * and if // is used, it is encoded as \:
                          * var\pattern<SPECIAL_VAR_SYMBOL>repl<SPECIAL_VAR_SYMBOL>
                          */
-                        /* Empty variable always gives nothing: */
-                        // "v=''; echo ${v/*/w}" prints "", not "w"
                         if (val && val[0]) {
                                 /* pattern uses non-standard expansion.
                                  * repl should be unbackslashed and globbed
@@ -5810,6 +5905,13 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                                         val = to_be_freed;
                                 free(pattern);
                                 free(repl);
+                        } else {
+                                /* Empty variable always gives nothing */
+                                // "v=''; echo ${v/*/w}" prints "", not "w"
+                                /* Just skip "replace" part */
+                                *p++ = SPECIAL_VAR_SYMBOL;
+                                p = strchr(p, SPECIAL_VAR_SYMBOL);
+                                *p = '\0';
                         }
                 }
 #endif /* BASH_PATTERN_SUBST */
@@ -6041,6 +6143,11 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                         arg++;
                         cant_be_null = 0x80;
                         break;
+                case SPECIAL_VAR_QUOTED_SVS:
+                        /* <SPECIAL_VAR_SYMBOL><SPECIAL_VAR_QUOTED_SVS><SPECIAL_VAR_SYMBOL> */
+                        arg++;
+                        val = SPECIAL_VAR_SYMBOL_STR;
+                        break;
 #if ENABLE_HUSH_TICK
                 case '`': /* <SPECIAL_VAR_SYMBOL>`cmd<SPECIAL_VAR_SYMBOL> */
                         *p = '\0'; /* replace trailing <SPECIAL_VAR_SYMBOL> */
@@ -6199,7 +6306,7 @@ static char *expand_string_to_string(const char *str, int do_unbackslash)
         return (char*)list;
 }
 
-/* Used for "eval" builtin and case string */
+#if ENABLE_HUSH_CASE
 static char* expand_strvec_to_string(char **argv)
 {
         char **list;
@@ -6221,6 +6328,7 @@ static char* expand_strvec_to_string(char **argv)
         debug_printf_expand("strvec_to_string='%s'\n", (char*)list);
         return (char*)list;
 }
+#endif
 
 static char **expand_assignments(char **argv, int count)
 {
@@ -6513,8 +6621,17 @@ static void parse_and_run_string(const char *s)
 static void parse_and_run_file(FILE *f)
 {
         struct in_str input;
+#if ENABLE_HUSH_LINENO_VAR
+        unsigned sv;
+
+        sv = G.lineno;
+        G.lineno = 1;
+#endif
         setup_file_in_str(&input, f);
         parse_and_run_stream(&input, ';');
+#if ENABLE_HUSH_LINENO_VAR
+        G.lineno = sv;
+#endif
 }
 
 #if ENABLE_HUSH_TICK
@@ -7330,6 +7447,32 @@ static void dump_cmd_in_x_mode(char **argv)
 # define dump_cmd_in_x_mode(argv) ((void)0)
 #endif
 
+#if ENABLE_HUSH_COMMAND
+static void if_command_vV_print_and_exit(char opt_vV, char *cmd, const char *explanation)
+{
+        char *to_free;
+
+        if (!opt_vV)
+                return;
+
+        to_free = NULL;
+        if (!explanation) {
+                char *path = getenv("PATH");
+                explanation = to_free = find_executable(cmd, &path); /* path == NULL is ok */
+                if (!explanation)
+                        _exit(1); /* PROG was not found */
+                if (opt_vV != 'V')
+                        cmd = to_free; /* -v PROG prints "/path/to/PROG" */
+        }
+        printf((opt_vV == 'V') ? "%s is %s\n" : "%s\n", cmd, explanation);
+        free(to_free);
+        fflush_all();
+        _exit(0);
+}
+#else
+# define if_command_vV_print_and_exit(a,b,c) ((void)0)
+#endif
+
 #if BB_MMU
 #define pseudo_exec_argv(nommu_save, argv, assignment_cnt, argv_expanded) \
         pseudo_exec_argv(argv, assignment_cnt, argv_expanded)
@@ -7350,7 +7493,11 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
                 char **argv, int assignment_cnt,
                 char **argv_expanded)
 {
+        const struct built_in_command *x;
         char **new_env;
+#if ENABLE_HUSH_COMMAND
+        char opt_vV = 0;
+#endif
 
         new_env = expand_assignments(argv, assignment_cnt);
         dump_cmd_in_x_mode(new_env);
@@ -7399,21 +7546,58 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
         }
 #endif
 
+#if ENABLE_HUSH_COMMAND
+        /* "command BAR": run BAR without looking it up among functions
+         * "command -v BAR": print "BAR" or "/path/to/BAR"; or exit 1
+         * "command -V BAR": print "BAR is {a function,a shell builtin,/path/to/BAR}"
+         */
+        while (strcmp(argv[0], "command") == 0 && argv[1]) {
+                char *p;
+
+                argv++;
+                p = *argv;
+                if (p[0] != '-' || !p[1])
+                        continue; /* bash allows "command command command [-OPT] BAR" */
+
+                for (;;) {
+                        p++;
+                        switch (*p) {
+                        case '\0':
+                                argv++;
+                                p = *argv;
+                                if (p[0] != '-' || !p[1])
+                                        goto after_opts;
+                                continue; /* next arg is also -opts, process it too */
+                        case 'v':
+                        case 'V':
+                                opt_vV = *p;
+                                continue;
+                        default:
+                                bb_error_msg_and_die("%s: %s: invalid option", "command", argv[0]);
+                        }
+                }
+        }
+ after_opts:
+# if ENABLE_HUSH_FUNCTIONS
+        if (opt_vV && find_function(argv[0]))
+                if_command_vV_print_and_exit(opt_vV, argv[0], "a function");
+# endif
+#endif
+
         /* Check if the command matches any of the builtins.
          * Depending on context, this might be redundant.  But it's
          * easier to waste a few CPU cycles than it is to figure out
          * if this is one of those cases.
          */
-        {
-                /* On NOMMU, it is more expensive to re-execute shell
-                 * just in order to run echo or test builtin.
-                 * It's better to skip it here and run corresponding
-                 * non-builtin later. */
-                const struct built_in_command *x;
-                x = BB_MMU ? find_builtin(argv[0]) : find_builtin1(argv[0]);
-                if (x) {
-                        exec_builtin(&nommu_save->argv_from_re_execing, x, argv);
-                }
+        /* Why "BB_MMU ? :" difference in logic? -
+         * On NOMMU, it is more expensive to re-execute shell
+         * just in order to run echo or test builtin.
+         * It's better to skip it here and run corresponding
+         * non-builtin later. */
+        x = BB_MMU ? find_builtin(argv[0]) : find_builtin1(argv[0]);
+        if (x) {
+                if_command_vV_print_and_exit(opt_vV, argv[0], "a shell builtin");
+                exec_builtin(&nommu_save->argv_from_re_execing, x, argv);
         }
 
 #if ENABLE_FEATURE_SH_STANDALONE
@@ -7421,6 +7605,7 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
         {
                 int a = find_applet_by_name(argv[0]);
                 if (a >= 0) {
+                        if_command_vV_print_and_exit(opt_vV, argv[0], "an applet");
 # if BB_MMU /* see above why on NOMMU it is not allowed */
                         if (APPLET_IS_NOEXEC(a)) {
                                 /* Do not leak open fds from opened script files etc.
@@ -7450,6 +7635,7 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
 #if ENABLE_FEATURE_SH_STANDALONE || BB_MMU
  skip:
 #endif
+        if_command_vV_print_and_exit(opt_vV, argv[0], NULL);
         execvp_or_die(argv);
 }
 
@@ -7992,6 +8178,11 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 char **new_env = NULL;
                 struct variable *old_vars = NULL;
 
+#if ENABLE_HUSH_LINENO_VAR
+                if (G.lineno_var)
+                        strcpy(G.lineno_var + sizeof("LINENO=")-1, utoa(command->lineno));
+#endif
+
                 if (argv[command->assignment_cnt] == NULL) {
                         /* Assignments, but no command */
                         /* Ensure redirects take effect (that is, create files).
@@ -8139,7 +8330,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
                         return rcode;
                 }
 
-                if (ENABLE_FEATURE_SH_NOFORK) {
+                if (ENABLE_FEATURE_SH_NOFORK && NUM_APPLETS > 1) {
                         int n = find_applet_by_name(argv_expanded[0]);
                         if (n >= 0 && APPLET_IS_NOFORK(n)) {
                                 rcode = redirect_and_varexp_helper(&new_env, &old_vars, command, &squirrel, argv_expanded);
@@ -8196,6 +8387,11 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 if (cmd_no < pi->num_cmds)
                         xpiped_pair(pipefds);
 
+#if ENABLE_HUSH_LINENO_VAR
+                if (G.lineno_var)
+                        strcpy(G.lineno_var + sizeof("LINENO=")-1, utoa(command->lineno));
+#endif
+
                 command->pid = BB_MMU ? fork() : vfork();
                 if (!command->pid) { /* child */
 #if ENABLE_HUSH_JOB
@@ -8387,7 +8583,10 @@ static int run_list(struct pipe *pi)
                                 rword, cond_code, last_rword);
 
                 sv_errexit_depth = G.errexit_depth;
-                if (IF_HAS_KEYWORDS(rword == RES_IF || rword == RES_ELIF ||)
+                if (
+#if ENABLE_HUSH_IF
+                    rword == RES_IF || rword == RES_ELIF ||
+#endif
                     pi->followup != PIPE_SEQ
                 ) {
                         G.errexit_depth++;
@@ -8828,17 +9027,19 @@ int hush_main(int argc, char **argv)
 #if !BB_MMU
         G.argv0_for_re_execing = argv[0];
 #endif
+
         /* Deal with HUSH_VERSION */
+        debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
+        unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
         shell_ver = xzalloc(sizeof(*shell_ver));
         shell_ver->flg_export = 1;
         shell_ver->flg_read_only = 1;
         /* Code which handles ${var<op>...} needs writable values for all variables,
          * therefore we xstrdup: */
         shell_ver->varstr = xstrdup(hush_version_str);
+
         /* Create shell local variables from the values
          * currently living in the environment */
-        debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
-        unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
         G.top_var = shell_ver;
         cur_var = G.top_var;
         e = environ;
@@ -8904,6 +9105,14 @@ int hush_main(int argc, char **argv)
          */
 #endif
 
+#if ENABLE_HUSH_LINENO_VAR
+        if (ENABLE_HUSH_LINENO_VAR) {
+                char *p = xasprintf("LINENO=%*s", (int)(sizeof(int)*3), "");
+                set_local_var(p, /*flags*/ 0);
+                G.lineno_var = p; /* can't assign before set_local_var("LINENO=...") */
+        }
+#endif
+
 #if ENABLE_FEATURE_EDITING
         G.line_input_state = new_line_input_t(FOR_SHELL);
 #endif
@@ -9346,13 +9555,34 @@ static int FAST_FUNC builtin_eval(char **argv)
         int rcode = EXIT_SUCCESS;
 
         argv = skip_dash_dash(argv);
-        if (*argv) {
-                char *str = expand_strvec_to_string(argv);
+        if (argv[0]) {
+                char *str = NULL;
+
+                if (argv[1]) {
+                        /* "The eval utility shall construct a command by
+                         * concatenating arguments together, separating
+                         * each with a <space> character."
+                         */
+                        char *p;
+                        unsigned len = 0;
+                        char **pp = argv;
+                        do
+                                len += strlen(*pp) + 1;
+                        while (*++pp);
+                        str = p = xmalloc(len);
+                        pp = argv;
+                        do {
+                                p = stpcpy(p, *pp);
+                                *p++ = ' ';
+                        } while (*++pp);
+                        p[-1] = '\0';
+                }
+
                 /* bash:
                  * eval "echo Hi; done" ("done" is syntax error):
                  * "echo Hi" will not execute too.
                  */
-                parse_and_run_string(str);
+                parse_and_run_string(str ? str : argv[0]);
                 free(str);
                 rcode = G.last_exitcode;
         }
@@ -9855,7 +10085,7 @@ static int FAST_FUNC builtin_set(char **argv)
 
         /* Nothing known, so abort */
  error:
-        bb_error_msg("set: %s: invalid option", arg);
+        bb_error_msg("%s: %s: invalid option", "set", arg);
         return EXIT_FAILURE;
 }
 #endif
@@ -10038,6 +10268,11 @@ static int FAST_FUNC builtin_source(char **argv)
                 arg_path = find_in_path(filename);
                 if (arg_path)
                         filename = arg_path;
+                else if (!ENABLE_HUSH_BASH_SOURCE_CURDIR) {
+                        errno = ENOENT;
+                        bb_simple_perror_msg(filename);
+                        return EXIT_FAILURE;
+                }
         }
         input = remember_FILE(fopen_or_warn(filename, "r"));
         free(arg_path);
diff --git a/shell/hush_test/hush-arith/arith-postinc.right b/shell/hush_test/hush-arith/arith-postinc.right
new file mode 100644
index 000000000..c95ce02bf
--- /dev/null
+++ b/shell/hush_test/hush-arith/arith-postinc.right
@@ -0,0 +1,5 @@
+1 1
+1 1
+1 1
+1 1
+Ok:0
diff --git a/shell/hush_test/hush-arith/arith-postinc.tests b/shell/hush_test/hush-arith/arith-postinc.tests
new file mode 100755
index 000000000..3fd9bfed5
--- /dev/null
+++ b/shell/hush_test/hush-arith/arith-postinc.tests
@@ -0,0 +1,5 @@
+echo 1 $((0++1))
+echo 1 $((0--1))
+x=-1; echo 1 $((0-$x))
+x=+1; echo 1 $((0+$x))
+echo Ok:$?
diff --git a/shell/hush_test/hush-arith/arith.right b/shell/hush_test/hush-arith/arith.right
index 8a201fb3b..c48e468a5 100644
--- a/shell/hush_test/hush-arith/arith.right
+++ b/shell/hush_test/hush-arith/arith.right
@@ -135,6 +135,10 @@ hush: arithmetic syntax error
 hush: arithmetic syntax error
 5 5
 1 1
+6 6
+2 2
+3 3
+1 1
 4 4
 0 0
 hush: arithmetic syntax error
diff --git a/shell/hush_test/hush-arith/arith2.sub b/shell/hush_test/hush-arith/arith2.sub
index f7e3c9235..9105059db 100755
--- a/shell/hush_test/hush-arith/arith2.sub
+++ b/shell/hush_test/hush-arith/arith2.sub
@@ -23,14 +23,14 @@
 echo 5 $(( 4 + ++a ))
 echo 1 $a
 
-# ash doesn't handle it right...
-#ash# echo 6 $(( 4+++a ))
-#ash# echo 2 $a
+# this is treated as 4 + ++a
+echo 6 $(( 4+++a ))
+echo 2 $a
       a=2
 
-# ash doesn't handle it right...
-#ash# echo 3 $(( 4---a ))
-#ash# echo 1 $a
+# this is treated as 4 - --a
+echo 3 $(( 4---a ))
+echo 1 $a
       a=1
 
 echo 4 $(( 4 - -- a ))
diff --git a/shell/hush_test/hush-misc/command2.right b/shell/hush_test/hush-misc/command2.right
new file mode 100644
index 000000000..e3214f0a9
--- /dev/null
+++ b/shell/hush_test/hush-misc/command2.right
@@ -0,0 +1,2 @@
+test1
+hush: can't execute './test2.sh': Permission denied
diff --git a/shell/hush_test/hush-misc/command2.tests b/shell/hush_test/hush-misc/command2.tests
new file mode 100755
index 000000000..9d9de9a89
--- /dev/null
+++ b/shell/hush_test/hush-misc/command2.tests
@@ -0,0 +1,6 @@
+echo "echo test1; ./test2.sh" >test1.sh
+echo "echo test2" >test2.sh
+
+command . ./test1.sh
+
+rm -f test1.sh test2.sh
diff --git a/shell/hush_test/hush-misc/control_char1.right b/shell/hush_test/hush-misc/control_char1.right
new file mode 100644
index 000000000..6f8c2533c
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char1.right
@@ -0,0 +1,3 @@
+
+b#c
+Done:0
diff --git a/shell/hush_test/hush-misc/control_char1.tests b/shell/hush_test/hush-misc/control_char1.tests
new file mode 100755
index 000000000..0cfe60141
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char1.tests
@@ -0,0 +1,3 @@
+echo 
+echo 'b#c'
+echo Done:$?
diff --git a/shell/hush_test/hush-misc/control_char2.right b/shell/hush_test/hush-misc/control_char2.right
new file mode 100644
index 000000000..9498b420d
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char2.right
@@ -0,0 +1,2 @@
+
+Done:0
diff --git a/shell/hush_test/hush-misc/control_char2.tests b/shell/hush_test/hush-misc/control_char2.tests
new file mode 100755
index 000000000..e77d7a1a6
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char2.tests
@@ -0,0 +1,3 @@
+c=`printf '\3'`
+eval "echo $c"
+echo Done:$?
diff --git a/shell/hush_test/hush-misc/for_with_bslashes.right b/shell/hush_test/hush-misc/for_with_bslashes.right
index 02d96692c..cd8501050 100644
--- a/shell/hush_test/hush-misc/for_with_bslashes.right
+++ b/shell/hush_test/hush-misc/for_with_bslashes.right
@@ -5,4 +5,5 @@ b"c
 b'c
 b$c
 b`true`c
+b#c
 Zero:0
diff --git a/shell/hush_test/hush-misc/for_with_bslashes.tests b/shell/hush_test/hush-misc/for_with_bslashes.tests
index 363f3d85b..8acd9808a 100755
--- a/shell/hush_test/hush-misc/for_with_bslashes.tests
+++ b/shell/hush_test/hush-misc/for_with_bslashes.tests
@@ -1,9 +1,5 @@
-# UNFIXED BUG.
-# commented-out words contain ^C character.
-# It's a SPECIAL_VAR_SYMBOL, for now hush does not escape it.
-# When it is fixed, update this test.
-
-for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' ### 'b#c'
+# last word contains ^C character.
+for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b#c'
 do
     echo $a
 done
diff --git a/shell/hush_test/hush-vars/param_expand_bash_substring.right b/shell/hush_test/hush-vars/param_expand_bash_substring.right
index 2f4c51d06..a3cb549f7 100644
--- a/shell/hush_test/hush-vars/param_expand_bash_substring.right
+++ b/shell/hush_test/hush-vars/param_expand_bash_substring.right
@@ -3,6 +3,7 @@ hush: syntax error: unterminated ${name}
 hush: syntax error: unterminated ${name}
 hush: syntax error: unterminated ${name}
 0123456789
+0
 1    =||
 1:1  =||
 1:1:2=||
diff --git a/shell/hush_test/hush-vars/param_expand_bash_substring.tests b/shell/hush_test/hush-vars/param_expand_bash_substring.tests
index cce9f123e..512da351b 100755
--- a/shell/hush_test/hush-vars/param_expand_bash_substring.tests
+++ b/shell/hush_test/hush-vars/param_expand_bash_substring.tests
@@ -11,7 +11,7 @@ export var=0123456789
 "$THIS_SH" -c 'echo ${var:}' SHELL
 
 # then some funky ones
-# UNFIXED BUG: this should work: "$THIS_SH" -c 'echo ${?:0}'
+"$THIS_SH" -c 'echo ${?:0}' SHELL
 
 # now some valid ones
 set --; echo "1    =|${1}|"
diff --git a/shell/hush_test/hush-vars/var_LINENO1.right b/shell/hush_test/hush-vars/var_LINENO1.right
new file mode 100644
index 000000000..31e1a4478
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO1.right
@@ -0,0 +1,8 @@
+2:2
+3:3
+4:4
+5:5
+2:2
+3:3
+4:4
+5:5
diff --git a/shell/hush_test/hush-vars/var_LINENO1.tests b/shell/hush_test/hush-vars/var_LINENO1.tests
new file mode 100755
index 000000000..851b52cf5
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO1.tests
@@ -0,0 +1,6 @@
+env | grep LINENO
+echo 2:$LINENO
+echo 3:$LINENO >&2 \
+| { sleep 0.1; echo 4:$LINENO; }
+echo 5:$LINENO
+test "$1" || . ./var_LINENO1.tests norepeat
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.right b/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.right
new file mode 100644
index 000000000..d400a7e31
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.right
@@ -0,0 +1,2 @@
+v
+Ok:0
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.tests b/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.tests
new file mode 100755
index 000000000..6e8aa2afa
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_pattern.tests
@@ -0,0 +1,3 @@
+v=v
+echo ${v//}
+echo Ok:$?
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_var.right b/shell/hush_test/hush-vars/var_bash_repl_empty_var.right
new file mode 100644
index 000000000..892916783
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_var.right
@@ -0,0 +1,2 @@
+
+Ok:0
diff --git a/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests b/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests
new file mode 100755
index 000000000..73a43d38e
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash_repl_empty_var.tests
@@ -0,0 +1,3 @@
+v=''
+echo ${v/*/w}
+echo Ok:$?
diff --git a/shell/math.c b/shell/math.c
index f01f24362..611b3beab 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -598,10 +598,24 @@ evaluate_string(arith_state_t *math_state, const char *expr)
                 }
 
                 /* Should be an operator */
+
+                /* Special case: NUM-- and NUM++ are not recognized if NUM
+                 * is a literal number, not a variable. IOW:
+                 * "a+++v" is a++ + v.
+                 * "7+++v" is 7 + ++v, not 7++ + v.
+                 */
+                if (lasttok == TOK_NUM && !numstackptr[-1].var /* number literal */
+                 && (expr[0] == '+' || expr[0] == '-')
+                 && (expr[1] == expr[0])
+                ) {
+                        //bb_error_msg("special %c%c", expr[0], expr[0]);
+                        op = (expr[0] == '+' ? TOK_ADD : TOK_SUB);
+                        expr += 1;
+                        goto tok_found1;
+                }
+
                 p = op_tokens;
                 while (1) {
-// TODO: bash allows 7+++v, treats it as 7 + ++v
-// we treat it as 7++ + v and reject
                         /* Compare expr to current op_tokens[] element */
                         const char *e = expr;
                         while (1) {
@@ -627,6 +641,7 @@ evaluate_string(arith_state_t *math_state, const char *expr)
                 }
  tok_found:
                 op = p[1]; /* fetch TOK_foo value */
+ tok_found1:
                 /* NB: expr now points past the operator */
 
                 /* post grammar: a++ reduce to num */