Merge branch 'busybox' into merge

35 files changed, 389 insertions, 251 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 508633689..7544204d1 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -329,6 +329,10 @@ typedef long arith_t;
 # define PIPE_BUF 4096           /* amount of buffering in a pipe */
 #endif
 
+#ifndef unlikely
+# define unlikely(cond) (cond)
+#endif
+
 #if !ENABLE_PLATFORM_MINGW32
 # define is_absolute_path(path) ((path)[0] == '/')
 #endif
@@ -456,6 +460,7 @@ static const char *const optletters_optnames[] = {
         "a"   "allexport",
         "b"   "notify",
         "u"   "nounset",
+        "E"   "errtrace",
         "\0"  "vi"
 #if BASH_PIPEFAIL
         ,"\0"  "pipefail"
@@ -518,6 +523,7 @@ struct globals_misc {
 #if !ENABLE_PLATFORM_MINGW32
         smallint job_warning;   /* user was warned about stopped jobs (can be 2, 1 or 0). */
 #endif
+        smallint inps4;         /* Prevent PS4 nesting. */
         int savestatus;         /* exit status of last command outside traps */
         int rootpid;            /* pid of main shell */
         /* shell level: 0 for the main shell, 1 for its children, and so on */
@@ -573,23 +579,24 @@ struct globals_misc {
 #define aflag optlist[11]
 #define bflag optlist[12]
 #define uflag optlist[13]
-#define viflag optlist[14]
+#define Eflag optlist[14]
+#define viflag optlist[15]
 #if BASH_PIPEFAIL
-# define pipefail optlist[15]
+# define pipefail optlist[16]
 #else
 # define pipefail 0
 #endif
 #if DEBUG
-# define nolog optlist[15 + BASH_PIPEFAIL]
-# define debug optlist[16 + BASH_PIPEFAIL]
+# define nolog optlist[16 + BASH_PIPEFAIL]
+# define debug optlist[17 + BASH_PIPEFAIL]
 #endif
 #if ENABLE_PLATFORM_MINGW32
-# define winxp optlist[15 + BASH_PIPEFAIL + 2*DEBUG]
+# define winxp optlist[16 + BASH_PIPEFAIL + 2*DEBUG]
 # if ENABLE_ASH_NOCONSOLE
-#  define noconsole optlist[16 + BASH_PIPEFAIL + 2*DEBUG]
+#  define noconsole optlist[17 + BASH_PIPEFAIL + 2*DEBUG]
 # endif
 # if ENABLE_ASH_NOCASEGLOB
-#  define nocaseglob optlist[16 + BASH_PIPEFAIL + 2*DEBUG+ENABLE_ASH_NOCONSOLE]
+#  define nocaseglob optlist[17 + BASH_PIPEFAIL + 2*DEBUG+ENABLE_ASH_NOCONSOLE]
 # endif
 #endif
 
@@ -610,7 +617,11 @@ struct globals_misc {
         uint8_t gotsig[NSIG - 1]; /* offset by 1: "signal" 0 is meaningless */
         uint8_t may_have_traps; /* 0: definitely no traps are set, 1: some traps may be set */
 #endif
-        char *trap[NSIG];
+        char *trap[NSIG + 1];
+/* trap[0] is EXIT trap, trap[NTRAP_ERR] is ERR trap, other trap[i] are signal traps */
+#define NTRAP_ERR  NSIG
+#define NTRAP_LAST NSIG
+
 #if !ENABLE_PLATFORM_MINGW32
         char **trap_ptr;        /* used only by "trap hack" */
 #endif
@@ -626,6 +637,7 @@ extern struct globals_misc *BB_GLOBAL_CONST 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 inps4       (G_misc.inps4      )
 #define savestatus  (G_misc.savestatus )
 #define rootpid     (G_misc.rootpid    )
 #define shlvl       (G_misc.shlvl      )
@@ -742,6 +754,9 @@ struct strpush {
 #endif
         char *string;           /* remember the string since it may change */
 
+        /* Delay freeing so we can stop nested aliases. */
+        struct strpush *spfree;
+
         /* Remember last two characters for pungetc. */
         int lastc[2];
 
@@ -764,6 +779,9 @@ struct parsefile {
         struct strpush *strpush; /* for pushing strings at this level */
         struct strpush basestrpush; /* so pushing one is fast */
 
+        /* Delay freeing so we can stop nested aliases. */
+        struct strpush *spfree;
+
         /* Remember last two characters for pungetc. */
         int lastc[2];
 
@@ -2366,6 +2384,8 @@ struct globals_var {
         struct var varinit[ARRAY_SIZE(varinit_data)];
         int lineno;
         char linenovar[sizeof("LINENO=") + sizeof(int)*3];
+        unsigned trap_depth;
+        bool in_trap_ERR; /* ERR cannot recurse, no need to be a counter */
 };
 extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
 #define G_var (*ash_ptr_to_globals_var)
@@ -2376,6 +2396,8 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
 #define varinit       (G_var.varinit      )
 #define lineno        (G_var.lineno       )
 #define linenovar     (G_var.linenovar    )
+#define trap_depth    (G_var.trap_depth   )
+#define in_trap_ERR   (G_var.in_trap_ERR  )
 #define vifs      varinit[0]
 #if ENABLE_ASH_MAIL
 # define vmail    varinit[1]
@@ -2547,7 +2569,7 @@ lookupvar(const char *name)
                         v->var_func(NULL);
 #endif
                 if (!(v->flags & VUNSET)) {
-                        if (v == &vlineno && v->var_text == linenovar) {
+                        if (v->var_text == linenovar) {
                                 fmtstr(linenovar+7, sizeof(linenovar)-7, "%d", lineno);
                         }
                         return var_end(v->var_text);
@@ -3439,12 +3461,8 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #define CENDFILE 11             /* end of file */
 #define CCTL     12             /* like CWORD, except it must be escaped */
 #define CSPCL    13             /* these terminate a word */
-#define CIGN     14             /* character should be ignored */
 
 #define PEOF     256
-#if ENABLE_ASH_ALIAS
-# define PEOA    257
-#endif
 
 #define USE_SIT_FUNCTION ENABLE_ASH_OPTIMIZE_FOR_SIZE
 
@@ -3454,49 +3472,43 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 # define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8))
 #endif
 static const uint16_t S_I_T[] ALIGN2 = {
-#if ENABLE_ASH_ALIAS
-        SIT_ITEM(CSPCL   , CIGN     , CIGN , CIGN   ),    /* 0, PEOA */
-#endif
-        SIT_ITEM(CSPCL   , CWORD    , CWORD, CWORD  ),    /* 1, ' ' */
-        SIT_ITEM(CNL     , CNL      , CNL  , CNL    ),    /* 2, \n */
-        SIT_ITEM(CWORD   , CCTL     , CCTL , CWORD  ),    /* 3, !*-/:=?[]~ */
-        SIT_ITEM(CDQUOTE , CENDQUOTE, CWORD, CWORD  ),    /* 4, '"' */
-        SIT_ITEM(CVAR    , CVAR     , CWORD, CVAR   ),    /* 5, $ */
-        SIT_ITEM(CSQUOTE , CWORD    , CENDQUOTE, CWORD),  /* 6, "'" */
-        SIT_ITEM(CSPCL   , CWORD    , CWORD, CLP    ),    /* 7, ( */
-        SIT_ITEM(CSPCL   , CWORD    , CWORD, CRP    ),    /* 8, ) */
-        SIT_ITEM(CBACK   , CBACK    , CCTL , CBACK  ),    /* 9, \ */
-        SIT_ITEM(CBQUOTE , CBQUOTE  , CWORD, CBQUOTE),    /* 10, ` */
-        SIT_ITEM(CENDVAR , CENDVAR  , CWORD, CENDVAR),    /* 11, } */
+        SIT_ITEM(CSPCL   , CWORD    , CWORD, CWORD  ),    /* 0, ' ' */
+        SIT_ITEM(CNL     , CNL      , CNL  , CNL    ),    /* 1, \n */
+        SIT_ITEM(CWORD   , CCTL     , CCTL , CWORD  ),    /* 2, !*-/:=?[]~ */
+        SIT_ITEM(CDQUOTE , CENDQUOTE, CWORD, CWORD  ),    /* 3, '"' */
+        SIT_ITEM(CVAR    , CVAR     , CWORD, CVAR   ),    /* 4, $ */
+        SIT_ITEM(CSQUOTE , CWORD    , CENDQUOTE, CWORD),  /* 5, "'" */
+        SIT_ITEM(CSPCL   , CWORD    , CWORD, CLP    ),    /* 6, ( */
+        SIT_ITEM(CSPCL   , CWORD    , CWORD, CRP    ),    /* 7, ) */
+        SIT_ITEM(CBACK   , CBACK    , CCTL , CBACK  ),    /* 8, \ */
+        SIT_ITEM(CBQUOTE , CBQUOTE  , CWORD, CBQUOTE),    /* 9, ` */
+        SIT_ITEM(CENDVAR , CENDVAR  , CWORD, CENDVAR),    /* 10, } */
 #if !USE_SIT_FUNCTION
-        SIT_ITEM(CENDFILE, CENDFILE , CENDFILE, CENDFILE),/* 12, PEOF */
-        SIT_ITEM(CWORD   , CWORD    , CWORD, CWORD  ),    /* 13, 0-9A-Za-z */
-        SIT_ITEM(CCTL    , CCTL     , CCTL , CCTL   )     /* 14, CTLESC ... */
+        SIT_ITEM(CENDFILE, CENDFILE , CENDFILE, CENDFILE),/* 11, PEOF */
+        SIT_ITEM(CWORD   , CWORD    , CWORD, CWORD  ),    /* 12, 0-9A-Za-z */
+        SIT_ITEM(CCTL    , CCTL     , CCTL , CCTL   )     /* 13, CTLESC ... */
 #endif
 #undef SIT_ITEM
 };
 /* Constants below must match table above */
 enum {
-#if ENABLE_ASH_ALIAS
-        CSPCL_CIGN_CIGN_CIGN               , /*  0 */
-#endif
-        CSPCL_CWORD_CWORD_CWORD            , /*  1 */
-        CNL_CNL_CNL_CNL                    , /*  2 */
-        CWORD_CCTL_CCTL_CWORD              , /*  3 */
-        CDQUOTE_CENDQUOTE_CWORD_CWORD      , /*  4 */
-        CVAR_CVAR_CWORD_CVAR               , /*  5 */
-        CSQUOTE_CWORD_CENDQUOTE_CWORD      , /*  6 */
-        CSPCL_CWORD_CWORD_CLP              , /*  7 */
-        CSPCL_CWORD_CWORD_CRP              , /*  8 */
-        CBACK_CBACK_CCTL_CBACK             , /*  9 */
-        CBQUOTE_CBQUOTE_CWORD_CBQUOTE      , /* 10 */
-        CENDVAR_CENDVAR_CWORD_CENDVAR      , /* 11 */
-        CENDFILE_CENDFILE_CENDFILE_CENDFILE, /* 12 */
-        CWORD_CWORD_CWORD_CWORD            , /* 13 */
-        CCTL_CCTL_CCTL_CCTL                , /* 14 */
+        CSPCL_CWORD_CWORD_CWORD            , /*  0 */
+        CNL_CNL_CNL_CNL                    , /*  1 */
+        CWORD_CCTL_CCTL_CWORD              , /*  2 */
+        CDQUOTE_CENDQUOTE_CWORD_CWORD      , /*  3 */
+        CVAR_CVAR_CWORD_CVAR               , /*  4 */
+        CSQUOTE_CWORD_CENDQUOTE_CWORD      , /*  5 */
+        CSPCL_CWORD_CWORD_CLP              , /*  6 */
+        CSPCL_CWORD_CWORD_CRP              , /*  7 */
+        CBACK_CBACK_CCTL_CBACK             , /*  8 */
+        CBQUOTE_CBQUOTE_CWORD_CBQUOTE      , /*  9 */
+        CENDVAR_CENDVAR_CWORD_CENDVAR      , /* 10 */
+        CENDFILE_CENDFILE_CENDFILE_CENDFILE, /* 11 */
+        CWORD_CWORD_CWORD_CWORD            , /* 12 */
+        CCTL_CCTL_CCTL_CCTL                , /* 13 */
 };
 
-/* c in SIT(c, syntax) must be an *unsigned char* or PEOA or PEOF,
+/* c in SIT(c, syntax) must be an *unsigned char* or PEOF,
  * caller must ensure proper cast on it if c is *char_ptr!
  */
 #if USE_SIT_FUNCTION
@@ -3514,44 +3526,28 @@ SIT(int c, int syntax)
          * but glibc one isn't. With '/' always treated as CWORD,
          * both work fine.
          */
-# if ENABLE_ASH_ALIAS
-        static const uint8_t syntax_index_table[] ALIGN1 = {
-                1, 2, 1, 3, 4, 5, 1, 6,         /* "\t\n !\"$&'" */
-                7, 8, 3, 3,/*3,*/3, 1, 1,       /* "()*-/:;<" */
-                3, 1, 3, 3, 9, 3, 10, 1,        /* "=>?[\\]`|" */
-                11, 3                           /* "}~" */
-        };
-# else
         static const uint8_t syntax_index_table[] ALIGN1 = {
                 0, 1, 0, 2, 3, 4, 0, 5,         /* "\t\n !\"$&'" */
                 6, 7, 2, 2,/*2,*/2, 0, 0,       /* "()*-/:;<" */
                 2, 0, 2, 2, 8, 2, 9, 0,         /* "=>?[\\]`|" */
                 10, 2                           /* "}~" */
         };
-# endif
         const char *s;
         int indx;
 
         if (c == PEOF)
                 return CENDFILE;
-# if ENABLE_ASH_ALIAS
-        if (c == PEOA)
-                indx = 0;
-        else
-# endif
-        {
-                /* Cast is purely for paranoia here,
-                 * just in case someone passed signed char to us */
-                if ((unsigned char)c >= CTL_FIRST
-                 && (unsigned char)c <= CTL_LAST
-                ) {
-                        return CCTL;
-                }
-                s = strchrnul(spec_symbls, c);
-                if (*s == '\0')
-                        return CWORD;
-                indx = syntax_index_table[s - spec_symbls];
+        /* Cast is purely for paranoia here,
+         * just in case someone passed signed char to us */
+        if ((unsigned char)c >= CTL_FIRST
+         && (unsigned char)c <= CTL_LAST
+        ) {
+                return CCTL;
         }
+        s = strchrnul(spec_symbls, c);
+        if (*s == '\0')
+                return CWORD;
+        indx = syntax_index_table[s - spec_symbls];
         return (S_I_T[indx] >> (syntax*4)) & 0xf;
 }
 
@@ -3822,9 +3818,6 @@ static const uint8_t syntax_index_table[] ALIGN1 = {
         /* 254      */ CWORD_CWORD_CWORD_CWORD,
         /* 255      */ CWORD_CWORD_CWORD_CWORD,
         /* PEOF */     CENDFILE_CENDFILE_CENDFILE_CENDFILE,
-# if ENABLE_ASH_ALIAS
-        /* PEOA */     CSPCL_CIGN_CIGN_CIGN,
-# endif
 };
 
 #if 1
@@ -5712,13 +5705,13 @@ clear_traps(void)
         char **tp;
 
         INT_OFF;
-        for (tp = trap; tp < &trap[NSIG]; tp++) {
+        for (tp = trap; tp <= &trap[NTRAP_LAST]; tp++) {
                 if (*tp && **tp) {      /* trap not NULL or "" (SIG_IGN) */
                         if (trap_ptr == trap)
                                 free(*tp);
                         /* else: it "belongs" to trap_ptr vector, don't free */
                         *tp = NULL;
-                        if ((tp - trap) != 0)
+                        if ((tp - trap) != 0 && (tp - trap) < NSIG)
                                 setsignal(tp - trap);
                 }
         }
@@ -10007,7 +10000,9 @@ dotrap(void)
                 *g = 0;
                 if (!p)
                         continue;
+                trap_depth++;
                 evalstring(p, 0);
+                trap_depth--;
                 if (evalskip != SKIPFUNC)
                         exitstatus = status;
         }
@@ -10044,6 +10039,9 @@ evaltree(union node *n, int flags)
 
         setstackmark(&smark);
 
+        if (nflag)
+                goto out;
+
         if (n == NULL) {
                 TRACE(("evaltree(NULL) called\n"));
                 goto out;
@@ -10064,8 +10062,6 @@ evaltree(union node *n, int flags)
                 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);
@@ -10078,8 +10074,7 @@ evaltree(union node *n, int flags)
         case NCMD:
                 evalfn = evalcommand;
  checkexit:
-                if (eflag && !(flags & EV_TESTED))
-                        checkexit = ~0;
+                checkexit = ~flags & EV_TESTED;
                 goto calleval;
         case NFOR:
                 evalfn = evalfor;
@@ -10101,7 +10096,6 @@ evaltree(union node *n, int flags)
         case NAND:
         case NOR:
         case NSEMI: {
-
 #if NAND + 1 != NOR
 #error NAND + 1 != NOR
 #endif
@@ -10129,8 +10123,7 @@ evaltree(union node *n, int flags)
                 if (!status) {
                         n = n->nif.ifpart;
                         goto evaln;
-                }
-                if (n->nif.elsepart) {
+                } else if (n->nif.elsepart) {
                         n = n->nif.elsepart;
                         goto evaln;
                 }
@@ -10152,10 +10145,36 @@ evaltree(union node *n, int flags)
          */
         dotrap();
 
-        if (checkexit & status)
-                raise_exception(EXEND);
-        if (flags & EV_EXIT)
+        if (checkexit && status) {
+                if (trap[NTRAP_ERR] && !in_trap_ERR) {
+                        int err;
+                        struct jmploc *volatile savehandler = exception_handler;
+                        struct jmploc jmploc;
+
+                        in_trap_ERR = 1;
+                        trap_depth++;
+                        err = setjmp(jmploc.loc);
+                        if (!err) {
+                                exception_handler = &jmploc;
+                                savestatus = exitstatus;
+                                evalstring(trap[NTRAP_ERR], 0);
+                        }
+                        trap_depth--;
+                        in_trap_ERR = 0;
+
+                        exception_handler = savehandler;
+                        if (err && exception_type != EXERROR)
+                                longjmp(exception_handler->loc, 1);
+
+                        exitstatus = savestatus;
+                }
+                if (eflag)
+                        goto exexit;
+        }
+        if (flags & EV_EXIT) {
+ exexit:
                 raise_exception(EXEND);
+        }
 
         popstackmark(&smark);
         TRACE(("leaving evaltree (no interrupts)\n"));
@@ -10221,8 +10240,6 @@ evalfor(union node *n, int flags)
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
-        if (funcline)
-                lineno -= funcline - 1;
 
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
@@ -10253,8 +10270,6 @@ evalcase(union node *n, int flags)
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
-        if (funcline)
-                lineno -= funcline - 1;
 
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
@@ -10289,8 +10304,6 @@ evalsubshell(union node *n, int flags)
         int status;
 
         errlinno = lineno = n->nredir.linno;
-        if (funcline)
-                lineno -= funcline - 1;
 
         expredir(n->nredir.redirect);
         if (!backgnd && (flags & EV_EXIT) && !may_have_traps)
@@ -10639,8 +10652,15 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         struct jmploc *volatile savehandler;
         struct jmploc jmploc;
         int e;
+        int savelineno;
         int savefuncline;
+        char *savetrap = NULL;
 
+        if (!Eflag) {
+                savetrap = trap[NTRAP_ERR];
+                trap[NTRAP_ERR] = NULL;
+        }
+        savelineno = lineno;
         saveparam = shellparam;
         savefuncline = funcline;
         savehandler = exception_handler;
@@ -10663,7 +10683,14 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         evaltree(func->n.ndefun.body, flags & EV_TESTED);
  funcdone:
         INT_OFF;
+        if (savetrap) {
+                if (!trap[NTRAP_ERR])
+                        trap[NTRAP_ERR] = savetrap;
+                else
+                        free(savetrap);
+        }
         funcline = savefuncline;
+        lineno = savelineno;
         freefunc(func);
         freeparam(&shellparam);
         shellparam = saveparam;
@@ -11076,11 +11103,12 @@ evalcommand(union node *cmd, int flags)
         int vlocal;
 
         errlinno = lineno = cmd->ncmd.linno;
-        if (funcline)
-                lineno -= funcline - 1;
 
         /* First expand the arguments. */
         TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+#if BASH_PROCESS_SUBST
+        redir_stop = redirlist;
+#endif
         file_stop = g_parsefile;
         back_exitstatus = 0;
 
@@ -11159,7 +11187,11 @@ evalcommand(union node *cmd, int flags)
                 lastarg = nargv[-1];
 
         expredir(cmd->ncmd.redirect);
+#if !BASH_PROCESS_SUBST
         redir_stop = pushredir(cmd->ncmd.redirect);
+#else
+        pushredir(cmd->ncmd.redirect);
+#endif
         preverrout_fd = 2;
         if (BASH_XTRACEFD && xflag) {
                 /* NB: bash closes fd == $BASH_XTRACEFD when it is changed.
@@ -11196,10 +11228,12 @@ evalcommand(union node *cmd, int flags)
         }
 
         /* Print the command if xflag is set. */
-        if (xflag) {
+        if (xflag && !inps4) {
                 const char *pfx = "";
 
+                inps4 = 1;
                 fdprintf(preverrout_fd, "%s", expandstr(ps4val(), DQSYNTAX));
+                inps4 = 0;
 
                 sp = varlist.list;
                 while (sp) {
@@ -11483,7 +11517,7 @@ pushstring(char *s, struct alias *ap)
 
         len = strlen(s);
         INT_OFF;
-        if (g_parsefile->strpush) {
+        if (g_parsefile->strpush || g_parsefile->spfree) {
                 sp = ckzalloc(sizeof(*sp));
                 sp->prev = g_parsefile->strpush;
         } else {
@@ -11493,6 +11527,7 @@ pushstring(char *s, struct alias *ap)
         sp->prev_string = g_parsefile->next_to_pgetc;
         sp->prev_left_in_line = g_parsefile->left_in_line;
         sp->unget = g_parsefile->unget;
+        sp->spfree = g_parsefile->spfree;
         memcpy(sp->lastc, g_parsefile->lastc, sizeof(sp->lastc));
 #if ENABLE_ASH_ALIAS
         sp->ap = ap;
@@ -11504,11 +11539,11 @@ pushstring(char *s, struct alias *ap)
         g_parsefile->next_to_pgetc = s;
         g_parsefile->left_in_line = len;
         g_parsefile->unget = 0;
+        g_parsefile->spfree = NULL;
         INT_ON;
 }
 
-static void
-popstring(void)
+static void popstring(void)
 {
         struct strpush *sp = g_parsefile->strpush;
 
@@ -11523,10 +11558,6 @@ popstring(void)
                 if (sp->string != sp->ap->val) {
                         free(sp->string);
                 }
-                sp->ap->flag &= ~ALIASINUSE;
-                if (sp->ap->flag & ALIASDEAD) {
-                        unalias(sp->ap->name);
-                }
         }
 #endif
         g_parsefile->next_to_pgetc = sp->prev_string;
@@ -11534,8 +11565,7 @@ popstring(void)
         g_parsefile->unget = sp->unget;
         memcpy(g_parsefile->lastc, sp->lastc, sizeof(sp->lastc));
         g_parsefile->strpush = sp->prev;
-        if (sp != &(g_parsefile->basestrpush))
-                free(sp);
+        g_parsefile->spfree = sp;
         INT_ON;
 }
 
@@ -11628,26 +11658,16 @@ preadfd(void)
  */
 //#define pgetc_debug(...) bb_error_msg(__VA_ARGS__)
 #define pgetc_debug(...) ((void)0)
-static int pgetc(void);
+static int __pgetc(void);
 static int
 preadbuffer(void)
 {
         char *q;
         int more;
 
-        if (g_parsefile->strpush) {
-#if ENABLE_ASH_ALIAS
-                if (g_parsefile->left_in_line == -1
-                 && g_parsefile->strpush->ap
-                 && g_parsefile->next_to_pgetc[-1] != ' '
-                 && g_parsefile->next_to_pgetc[-1] != '\t'
-                ) {
-                        pgetc_debug("preadbuffer PEOA");
-                        return PEOA;
-                }
-#endif
+        if (unlikely(g_parsefile->strpush)) {
                 popstring();
-                return pgetc();
+                return __pgetc();
         }
         /* on both branches above g_parsefile->left_in_line < 0.
          * "pgetc" needs refilling.
@@ -11729,18 +11749,43 @@ preadbuffer(void)
 static void
 nlprompt(void)
 {
-        g_parsefile->linno++;
+        if (trap_depth == 0)
+                g_parsefile->linno++;
         setprompt_if(doprompt, 2);
 }
 static void
 nlnoprompt(void)
 {
-        g_parsefile->linno++;
+        if (trap_depth == 0)
+                g_parsefile->linno++;
         needprompt = doprompt;
 }
 
-static int
-pgetc(void)
+static void freestrings(struct strpush *sp)
+{
+        INT_OFF;
+        do {
+                struct strpush *psp;
+
+                if (sp->ap) {
+                        sp->ap->flag &= ~ALIASINUSE;
+                        if (sp->ap->flag & ALIASDEAD) {
+                                unalias(sp->ap->name);
+                        }
+                }
+
+                psp = sp;
+                sp = sp->spfree;
+
+                if (psp != &(g_parsefile->basestrpush))
+                        free(psp);
+        } while (sp);
+
+        g_parsefile->spfree = NULL;
+        INT_ON;
+}
+
+static int __pgetc(void)
 {
         int c;
 
@@ -11762,23 +11807,19 @@ pgetc(void)
         return c;
 }
 
-#if ENABLE_ASH_ALIAS
-static int
-pgetc_without_PEOA(void)
+/*
+ * Read a character from the script, returning PEOF on end of file.
+ * Nul characters in the input are silently discarded.
+ */
+static int pgetc(void)
 {
-        int c;
-        do {
-                pgetc_debug("pgetc at %d:%p'%s'",
-                                g_parsefile->left_in_line,
-                                g_parsefile->next_to_pgetc,
-                                g_parsefile->next_to_pgetc);
-                c = pgetc();
-        } while (c == PEOA);
-        return c;
+        struct strpush *sp = g_parsefile->spfree;
+
+        if (unlikely(sp))
+                freestrings(sp);
+
+        return __pgetc();
 }
-#else
-# define pgetc_without_PEOA() pgetc()
-#endif
 
 /*
  * Undo a call to pgetc.  Only two characters may be pushed back.
@@ -11855,6 +11896,7 @@ pushfile(void)
         pf->prev = g_parsefile;
         pf->pf_fd = -1;
         /*pf->strpush = NULL; - ckzalloc did it */
+        /*pf->spfree = NULL;*/
         /*pf->basestrpush.prev = NULL;*/
         /*pf->unget = 0;*/
         g_parsefile = pf;
@@ -11872,8 +11914,12 @@ popfile(void)
         if (pf->pf_fd >= 0)
                 close(pf->pf_fd);
         free(pf->buf);
-        while (pf->strpush)
+        if (g_parsefile->spfree)
+                freestrings(g_parsefile->spfree);
+        while (pf->strpush) {
                 popstring();
+                freestrings(g_parsefile->spfree);
+        }
         g_parsefile = pf->prev;
         free(pf);
         INT_ON;
@@ -11969,7 +12015,7 @@ setinputstring(char *string)
         g_parsefile->next_to_pgetc = string;
         g_parsefile->left_in_line = strlen(string);
         g_parsefile->buf = NULL;
-        g_parsefile->linno = 1;
+        g_parsefile->linno = lineno;
         INT_ON;
 }
 
@@ -12553,27 +12599,28 @@ static union node *andor(void);
 static union node *pipeline(void);
 static union node *parse_command(void);
 static void parseheredoc(void);
-static int peektoken(void);
 static int readtoken(void);
 
 static union node *
 list(int nlflag)
 {
+        int chknl = nlflag & 1 ? 0 : CHKNL;
         union node *n1, *n2, *n3;
         int tok;
 
         n1 = NULL;
         for (;;) {
-                switch (readtoken()) {
+                checkkwd = chknl | CHKKWD | CHKALIAS;
+                tok = readtoken();
+                switch (tok) {
                 case TNL:
-                        if (!(nlflag & 1))
-                                break;
                         parseheredoc();
                         return n1;
 
                 case TEOF:
-                        if (!n1 && (nlflag & 1))
+                        if (!n1 && !chknl)
                                 n1 = NODE_EOF;
+ out_eof:
                         parseheredoc();
                         tokpushback++;
                         lasttoken = TEOF;
@@ -12581,8 +12628,7 @@ list(int nlflag)
                 }
 
                 tokpushback++;
-                checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                if (nlflag == 2 && ((1 << peektoken()) & tokendlist))
+                if (nlflag == 2 && ((1 << tok) & tokendlist))
                         return n1;
                 nlflag |= 2;
 
@@ -12611,15 +12657,16 @@ list(int nlflag)
                         n1 = n3;
                 }
                 switch (tok) {
-                case TNL:
                 case TEOF:
+                        goto out_eof;
+                case TNL:
                         tokpushback = 1;
                         /* fall through */
                 case TBACKGND:
                 case TSEMI:
                         break;
                 default:
-                        if ((nlflag & 1))
+                        if (!chknl)
                                 raise_error_unexpected_syntax(-1);
                         tokpushback = 1;
                         return n1;
@@ -12793,8 +12840,9 @@ simplecmd(void)
                 switch (t) {
 #if BASH_FUNCTION
                 case TFUNCTION:
-                        if (peektoken() != TWORD)
+                        if (readtoken() != TWORD)
                                 raise_error_unexpected_syntax(TWORD);
+                        tokpushback = 1;
                         function_flag = 1;
                         break;
 #endif
@@ -12831,7 +12879,9 @@ simplecmd(void)
 #if BASH_FUNCTION
                         if (function_flag) {
                                 checkkwd = CHKNL | CHKKWD;
-                                switch (peektoken()) {
+                                t = readtoken();
+                                tokpushback = 1;
+                                switch (t) {
                                 case TBEGIN:
                                 case TIF:
                                 case TCASE:
@@ -13184,7 +13234,7 @@ static int
 readtoken1(int c, int syntax, char *eofmark, int striptabs)
 {
         /* NB: syntax parameter fits into smallint */
-        /* c parameter is an unsigned char or PEOF or PEOA */
+        /* c parameter is an unsigned char or PEOF */
         char *out;
         size_t len;
         struct nodelist *bqlist;
@@ -13254,7 +13304,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                         USTPUTC(c, out);
                         break;
                 case CBACK:     /* backslash */
-                        c = pgetc_without_PEOA();
+                        c = pgetc();
                         if (c == PEOF) {
                                 USTPUTC(CTLESC, out);
                                 USTPUTC('\\', out);
@@ -13361,8 +13411,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                         break;
                 case CENDFILE:
                         goto endword;           /* exit outer loop */
-                case CIGN:
-                        break;
                 default:
                         if (synstack->varnest == 0) {
 #if BASH_REDIR_OUTPUT
@@ -13384,8 +13432,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
 #endif
                                 goto endword;   /* exit outer loop */
                         }
-                        IF_ASH_ALIAS(if (c != PEOA))
-                                USTPUTC(c, out);
+                        USTPUTC(c, out);
                 }
                 c = pgetc_top(synstack);
         } /* for (;;) */
@@ -13436,14 +13483,9 @@ checkend: {
                 int markloc;
                 char *p;
 
-#if ENABLE_ASH_ALIAS
-                if (c == PEOA)
-                        c = pgetc_without_PEOA();
-#endif
                 if (striptabs) {
-                        while (c == '\t') {
-                                c = pgetc_without_PEOA();
-                        }
+                        while (c == '\t')
+                                c = pgetc();
                 }
 
                 markloc = out - (char *)stackblock();
@@ -13457,12 +13499,13 @@ checkend: {
                          * F
                          * (see heredoc_bkslash_newline2.tests)
                          */
-                        c = pgetc_without_PEOA();
+                        c = pgetc();
                 }
 
                 if (c == '\n' || c == PEOF) {
                         c = PEOF;
-                        g_parsefile->linno++;
+                        if (trap_depth == 0)
+                                g_parsefile->linno++;
                         needprompt = doprompt;
                 } else {
                         int len_here;
@@ -13581,7 +13624,6 @@ parsesub: {
 
         c = pgetc_eatbnl();
         if ((checkkwd & CHKEOFMARK)
-         || c > 255 /* PEOA or PEOF */
          || (c != '(' && c != '{' && !is_name(c) && !is_special(c))
         ) {
 #if BASH_DOLLAR_SQUOTE
@@ -13604,7 +13646,7 @@ parsesub: {
                         PARSEBACKQNEW();
                 }
         } else {
-                /* $VAR, $<specialchar>, ${...}, or PEOA/PEOF */
+                /* $VAR, $<specialchar>, ${...}, or PEOF */
                 smalluint newsyn = synstack->syntax;
 
                 USTPUTC(CTLVAR, out);
@@ -13799,13 +13841,9 @@ parsebackq: {
                                 ) {
                                         STPUTC('\\', pout);
                                 }
-                                if (pc <= 255 /* not PEOA or PEOF */) {
-                                        break;
-                                }
-                                /* fall through */
+                                break;
 
                         case PEOF:
-                        IF_ASH_ALIAS(case PEOA:)
                                 raise_error_syntax("EOF in backquote substitution");
 
                         case '\n':
@@ -13940,7 +13978,7 @@ xxreadtoken(void)
         setprompt_if(needprompt, 2);
         for (;;) {                      /* until token or start of word found */
                 c = pgetc_eatbnl();
-                if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
+                if (c == ' ' || c == '\t')
                         continue;
 
                 if (c == '#') {
@@ -13998,7 +14036,6 @@ xxreadtoken(void)
                 c = pgetc_eatbnl();
                 switch (c) {
                 case ' ': case '\t':
-                IF_ASH_ALIAS(case PEOA:)
                         continue;
                 case '#':
                         while ((c = pgetc()) != '\n' && c != PEOF)
@@ -14058,10 +14095,14 @@ readtoken(void)
         if (kwd & CHKNL) {
                 while (t == TNL) {
                         parseheredoc();
+                        checkkwd = 0;
                         t = xxreadtoken();
                 }
         }
 
+        kwd |= checkkwd;
+        checkkwd = 0;
+
         if (t != TWORD || quoteflag) {
                 goto out;
         }
@@ -14080,7 +14121,7 @@ readtoken(void)
                 }
         }
 
-        if (checkkwd & CHKALIAS) {
+        if (kwd & CHKALIAS) {
 #if ENABLE_ASH_ALIAS
                 struct alias *ap;
                 ap = lookupalias(wordtext, 1);
@@ -14093,7 +14134,6 @@ readtoken(void)
 #endif
         }
  out:
-        checkkwd = 0;
 #if DEBUG
         if (!alreadyseen)
                 TRACE(("token '%s' %s\n", tokname_array[t], t == TWORD ? wordtext : ""));
@@ -14103,16 +14143,6 @@ readtoken(void)
         return t;
 }
 
-static int
-peektoken(void)
-{
-        int t;
-
-        t = readtoken();
-        tokpushback = 1;
-        return t;
-}
-
 /*
  * Read and parse a command.  Returns NODE_EOF on end of file.
  * (NULL is a valid parse tree indicating a blank line.)
@@ -14162,23 +14192,26 @@ parseheredoc(void)
 static const char *
 expandstr(const char *ps, int syntax_type)
 {
-        union node n;
+        struct parsefile *file_stop;
+        struct jmploc *volatile savehandler;
+        struct heredoc *saveheredoclist;
+        const char *result;
         int saveprompt;
-        struct parsefile *file_stop = g_parsefile;
-        volatile int saveint;
-        struct jmploc *volatile savehandler = exception_handler;
         struct jmploc jmploc;
-        const char *volatile result;
+        union node n;
         int err;
 
+        file_stop = g_parsefile;
+
         /* XXX Fix (char *) cast. */
         setinputstring((char *)ps);
 
+        saveheredoclist = heredoclist;
+        heredoclist = NULL;
         saveprompt = doprompt;
         doprompt = 0;
         result = ps;
-
-        SAVE_INT(saveint);
+        savehandler = exception_handler;
         err = setjmp(jmploc.loc);
         if (err)
                 goto out;
@@ -14188,7 +14221,7 @@ expandstr(const char *ps, int syntax_type)
          * PS1='$(date "+%H:%M:%S) > '
          */
         exception_handler = &jmploc;
-        readtoken1(pgetc(), syntax_type, FAKEEOFMARK, 0);
+        readtoken1(pgetc_eatbnl(), syntax_type, FAKEEOFMARK, 0);
 
         n.narg.type = NARG;
         n.narg.next = NULL;
@@ -14205,11 +14238,11 @@ out:
         exception_handler = savehandler;
         if (err && exception_type != EXERROR)
                 longjmp(exception_handler->loc, 1);
-        RESTORE_INT(saveint);
 
         doprompt = saveprompt;
         /* Try: PS1='`xxx(`' */
         unwindfiles(file_stop);
+        heredoclist = saveheredoclist;
 
         return result;
 }
@@ -14329,9 +14362,6 @@ cmdloop(int top)
                 if (doing_jobctl)
                         showjobs(SHOW_CHANGED|SHOW_STDERR);
 #endif
-#if BASH_PROCESS_SUBST
-                unwindredir(NULL);
-#endif
                 inter = 0;
                 if (iflag && top) {
                         inter++;
@@ -14355,7 +14385,7 @@ cmdloop(int top)
                                 out2str("\nUse \"exit\" to leave shell.\n");
                         }
                         numeof++;
-                } else if (nflag == 0) {
+                } else {
                         int i;
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -14746,7 +14776,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         nextopt(nullstr);
         ap = argptr;
         if (!*ap) {
-                for (signo = 0; signo < NSIG; signo++) {
+                for (signo = 0; signo <= NTRAP_LAST; signo++) {
                         char *tr = trap_ptr[signo];
                         if (tr) {
                                 /* note: bash adds "SIG", but only if invoked
@@ -14755,7 +14785,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                  * We are printing short names: */
                                 out1fmt("trap -- %s %s\n",
                                                 single_quote(tr),
-                                                get_signame(signo));
+                                                (signo == NTRAP_ERR) ? "ERR" : get_signame(signo));
                 /* trap_ptr != trap only if we are in special-cased `trap` code.
                  * In this case, we will exit very soon, no need to free(). */
                                 /* if (trap_ptr != trap && tp[0]) */
@@ -14781,7 +14811,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
         exitcode = 0;
         while (*ap) {
-                signo = get_signum(*ap);
+                signo = strcmp(*ap, "ERR") == 0 ? NTRAP_ERR : get_signum(*ap);
                 if (signo < 0) {
                         /* Mimic bash message exactly */
                         ash_msg("%s: invalid signal specification", *ap);
@@ -14802,7 +14832,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
                 free(trap[signo]);
                 trap[signo] = action;
-                if (signo != 0)
+                if (signo != 0 && signo < NSIG)
                         setsignal(signo);
                 INT_ON;
  next:
@@ -15197,6 +15227,7 @@ exitreset(void)
         }
         evalskip = 0;
         loopnest = 0;
+        inps4 = 0;
 
         /* from expand.c: */
         ifsfree();
@@ -15244,7 +15275,9 @@ exitshell(void)
         if (p) {
                 trap[0] = NULL;
                 evalskip = 0;
+                trap_depth++;
                 evalstring(p, 0);
+                trap_depth--;
                 evalskip = SKIPFUNCDEF;
                 /*free(p); - we'll exit soon */
         }
@@ -15704,6 +15737,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 // ^^ not necessary since now we special-case fd 0
                 // in save_fd_on_redirect()
 
+                lineno = 0; // bash compat
                 // dash: evalstring(minusc, sflag ? 0 : EV_EXIT);
                 // The above makes
                 //  ash -sc 'echo $-'
diff --git a/shell/ash_test/ash-alias/alias_brace.right b/shell/ash_test/ash-alias/alias_brace.right
new file mode 100644
index 000000000..7326d9603
--- /dev/null
+++ b/shell/ash_test/ash-alias/alias_brace.right
@@ -0,0 +1 @@
+Ok
diff --git a/shell/ash_test/ash-alias/alias_brace.tests b/shell/ash_test/ash-alias/alias_brace.tests
new file mode 100755
index 000000000..7571b64ac
--- /dev/null
+++ b/shell/ash_test/ash-alias/alias_brace.tests
@@ -0,0 +1,16 @@
+# Note: bash would need:
+#shopt -s expand_aliases
+# to enable aliases in non-interactive mode
+alias BEGIN={ END=}
+BEGIN
+        cat <<- EOF > /dev/null
+                $(:)
+        EOF
+END
+
+: <<- EOF &&
+        $(:)
+EOF
+BEGIN
+        echo Ok
+END
diff --git a/shell/ash_test/ash-alias/alias_case.right b/shell/ash_test/ash-alias/alias_case.right
new file mode 100644
index 000000000..7326d9603
--- /dev/null
+++ b/shell/ash_test/ash-alias/alias_case.right
@@ -0,0 +1 @@
+Ok
diff --git a/shell/ash_test/ash-alias/alias_case.tests b/shell/ash_test/ash-alias/alias_case.tests
new file mode 100755
index 000000000..ed8275875
--- /dev/null
+++ b/shell/ash_test/ash-alias/alias_case.tests
@@ -0,0 +1,8 @@
+# Note: bash would need:
+#shopt -s expand_aliases
+# to enable aliases in non-interactive mode
+alias a="case x in " b=x
+a
+b) echo BAD;;
+*) echo Ok;;
+esac
diff --git a/shell/ash_test/ash-misc/control_char3.right b/shell/ash_test/ash-misc/control_char3.right
index 283e02cbb..654005d24 100644
--- a/shell/ash_test/ash-misc/control_char3.right
+++ b/shell/ash_test/ash-misc/control_char3.right
@@ -1 +1 @@
-SHELL: line 1: : not found
+SHELL: line 0: : not found
diff --git a/shell/ash_test/ash-misc/control_char4.right b/shell/ash_test/ash-misc/control_char4.right
index 2bf18e684..ec9d5fc98 100644
--- a/shell/ash_test/ash-misc/control_char4.right
+++ b/shell/ash_test/ash-misc/control_char4.right
@@ -1 +1 @@
-SHELL: line 1: -: not found
+SHELL: line 0: -: not found
diff --git a/shell/ash_test/ash-misc/exitcode_trap7.right b/shell/ash_test/ash-misc/exitcode_trap7.right
new file mode 100644
index 000000000..07d66e9d9
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap7.right
@@ -0,0 +1,2 @@
+Start
+Ok:0
diff --git a/shell/ash_test/ash-misc/exitcode_trap7.tests b/shell/ash_test/ash-misc/exitcode_trap7.tests
new file mode 100755
index 000000000..f4b0eb544
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap7.tests
@@ -0,0 +1,7 @@
+$THIS_SH -c '
+cleanup() { set +e; false; }
+set -e
+trap cleanup EXIT
+echo Start
+'
+echo Ok:$?
diff --git a/shell/ash_test/ash-misc/set-n1.right b/shell/ash_test/ash-misc/set-n1.right
new file mode 100644
index 000000000..ac01831a7
--- /dev/null
+++ b/shell/ash_test/ash-misc/set-n1.right
@@ -0,0 +1,3 @@
+set -n stops in -c?
+YES
+Ok:0
diff --git a/shell/ash_test/ash-misc/set-n1.tests b/shell/ash_test/ash-misc/set-n1.tests
new file mode 100755
index 000000000..90d0f9146
--- /dev/null
+++ b/shell/ash_test/ash-misc/set-n1.tests
@@ -0,0 +1,2 @@
+$THIS_SH -c "echo 'set -n stops in -c?'; set -n; echo NO" && echo YES
+echo Ok:$?
diff --git a/shell/ash_test/ash-misc/shift1.right b/shell/ash_test/ash-misc/shift1.right
index b53453c3a..fdba79fd3 100644
--- a/shell/ash_test/ash-misc/shift1.right
+++ b/shell/ash_test/ash-misc/shift1.right
@@ -1,5 +1,5 @@
 2 3 4
-0: shift: line 1: Illegal number: -1
+0: shift: line 0: Illegal number: -1
 1 2 3 4
 2 3 4
 3 4
diff --git a/shell/ash_test/ash-misc/tickquote1.right b/shell/ash_test/ash-misc/tickquote1.right
index 2e661bfe3..e55a31c2d 100644
--- a/shell/ash_test/ash-misc/tickquote1.right
+++ b/shell/ash_test/ash-misc/tickquote1.right
@@ -1 +1 @@
-./tickquote1.tests: line 1: syntax error: unterminated quoted string
+./tickquote1.tests: line 0: syntax error: unterminated quoted string
diff --git a/shell/ash_test/ash-parsing/groups_and_keywords2.right b/shell/ash_test/ash-parsing/groups_and_keywords2.right
index 3fcbeb662..2ce38fe6e 100644
--- a/shell/ash_test/ash-parsing/groups_and_keywords2.right
+++ b/shell/ash_test/ash-parsing/groups_and_keywords2.right
@@ -1,3 +1,3 @@
-./groups_and_keywords2.tests: eval: line 1: syntax error: unexpected ")"
+./groups_and_keywords2.tests: eval: line 2: syntax error: unexpected ")"
 Fail:2
 ./groups_and_keywords2.tests: line 8: syntax error: unexpected ")"
diff --git a/shell/ash_test/ash-psubst/emptytick.right b/shell/ash_test/ash-psubst/emptytick.right
index 459c4f735..8fe9839ca 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 1: : Permission denied
+./emptytick.tests: line 2: : Permission denied
 127
-./emptytick.tests: line 1: : Permission denied
+./emptytick.tests: line 3: : Permission denied
 127
 0
 0
diff --git a/shell/ash_test/ash-vars/param_expand_alt.right b/shell/ash_test/ash-vars/param_expand_alt.right
index 1303f8064..d10f1206f 100644
--- a/shell/ash_test/ash-vars/param_expand_alt.right
+++ b/shell/ash_test/ash-vars/param_expand_alt.right
@@ -1,5 +1,5 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
 __
 _z_ _z_
 _ _ _ _ _
diff --git a/shell/ash_test/ash-vars/param_expand_assign.right b/shell/ash_test/ash-vars/param_expand_assign.right
index 6e9ea1379..52eaef9f8 100644
--- a/shell/ash_test/ash-vars/param_expand_assign.right
+++ b/shell/ash_test/ash-vars/param_expand_assign.right
@@ -1,11 +1,11 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
 0
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
 _aa
 _aa
 _aa
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 687dd9002..22a0b2881 100644
--- a/shell/ash_test/ash-vars/param_expand_bash_substring.right
+++ b/shell/ash_test/ash-vars/param_expand_bash_substring.right
@@ -1,8 +1,8 @@
-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: bad substitution
-SHELL: line 1: syntax error: missing '}'
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: missing '}'
 0
 1    =||
 1:1  =||
diff --git a/shell/ash_test/ash-vars/param_expand_default.right b/shell/ash_test/ash-vars/param_expand_default.right
index 7a42f67e8..0852105ca 100644
--- a/shell/ash_test/ash-vars/param_expand_default.right
+++ b/shell/ash_test/ash-vars/param_expand_default.right
@@ -1,4 +1,4 @@
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
 _0 _0
 _ _ _ _word _word
 _aaaa _aaaa _aaaa _aaaa _aaaa
diff --git a/shell/ash_test/ash-vars/param_expand_indicate_error.right b/shell/ash_test/ash-vars/param_expand_indicate_error.right
index 33afacee0..53ea07181 100644
--- a/shell/ash_test/ash-vars/param_expand_indicate_error.right
+++ b/shell/ash_test/ash-vars/param_expand_indicate_error.right
@@ -1,14 +1,14 @@
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
 1
 0
 ====
 _
-SHELL: line 1: 1: parameter not set
-SHELL: line 1: 1: parameter not set or null
-SHELL: line 1: 1: message1
-SHELL: line 1: 1: message1
-SHELL: line 1: 1: unset!
-SHELL: line 1: 1: null or unset!
+SHELL: line 0: 1: parameter not set
+SHELL: line 0: 1: parameter not set or null
+SHELL: line 0: 1: message1
+SHELL: line 0: 1: message1
+SHELL: line 0: 1: unset!
+SHELL: line 0: 1: null or unset!
 ====
 _aaaa
 _aaaa
@@ -19,20 +19,20 @@ _aaaa
 _aaaa
 ====
 _
-SHELL: line 1: f: parameter not set
-SHELL: line 1: f: parameter not set or null
-SHELL: line 1: f: message3
-SHELL: line 1: f: message3
-SHELL: line 1: f: unset!
-SHELL: line 1: f: null or unset!
+SHELL: line 0: f: parameter not set
+SHELL: line 0: f: parameter not set or null
+SHELL: line 0: f: message3
+SHELL: line 0: f: message3
+SHELL: line 0: f: unset!
+SHELL: line 0: f: null or unset!
 ====
 _
 _
-SHELL: line 1: f: parameter not set or null
+SHELL: line 0: f: parameter not set or null
 _
-SHELL: line 1: f: message4
+SHELL: line 0: f: message4
 _
-SHELL: line 1: f: null or unset!
+SHELL: line 0: f: null or unset!
 ====
 _fff
 _fff
diff --git a/shell/ash_test/ash-vars/var6.right b/shell/ash_test/ash-vars/var6.right
index b37417fa1..e83f7b5eb 100644
--- a/shell/ash_test/ash-vars/var6.right
+++ b/shell/ash_test/ash-vars/var6.right
@@ -1,2 +1,2 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
diff --git a/shell/ash_test/ash-vars/var_LINENO2.right b/shell/ash_test/ash-vars/var_LINENO2.right
new file mode 100644
index 000000000..73656647c
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO2.right
@@ -0,0 +1,3 @@
+Start LINENO=6, calling function
+In function: LINENO=4
+After function: LINENO=8
diff --git a/shell/ash_test/ash-vars/var_LINENO2.tests b/shell/ash_test/ash-vars/var_LINENO2.tests
new file mode 100755
index 000000000..7036dbdc8
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO2.tests
@@ -0,0 +1,8 @@
+#skip lines: make "line number within function" differ from overall line number
+#skip lines
+f() {
+        echo "In function: LINENO=$LINENO"
+}
+echo "Start LINENO=$LINENO, calling function"
+f
+echo "After function: LINENO=$LINENO"
diff --git a/shell/ash_test/ash-vars/var_LINENO3.right b/shell/ash_test/ash-vars/var_LINENO3.right
new file mode 100644
index 000000000..198c3cc99
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO3.right
@@ -0,0 +1,2 @@
+LINENO starts from 0 in -c
+and increments on next line: 1
diff --git a/shell/ash_test/ash-vars/var_LINENO3.tests b/shell/ash_test/ash-vars/var_LINENO3.tests
new file mode 100755
index 000000000..4502edfe0
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO3.tests
@@ -0,0 +1,2 @@
+$THIS_SH -c 'echo "LINENO starts from $LINENO in -c"
+echo "and increments on next line: $LINENO"'
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index caf033577..96703ef12 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+unset LANG LANGUAGE
+unset LC_COLLATE
+unset LC_CTYPE
+unset LC_MONETARY
+unset LC_MESSAGES
+unset LC_NUMERIC
+unset LC_TIME
+unset LC_ALL
+
 TOPDIR=`pwd`
 
 if test ! -x ash; then
@@ -61,11 +70,12 @@ do_test()
 #               echo Running test: "$x"
                 echo -n "$1/$x:"
                 {
-                        "$THIS_SH" "./$x" >"$name.xx" 2>&1
+                        "$THIS_SH" "./$x" 2>&1 | \
+                                grep -va "^ash: using fallback suid method$" >"$name.xx" 
                         diff -u "$name.xx" "$name.right" >"$TOPDIR/$noslash-$x.fail" \
                         && rm -f "$name.xx" "$TOPDIR/$noslash-$x.fail"
                 } && echo " ok" || echo " fail"
-                done
+        done
         )
 }
 
diff --git a/shell/hush.c b/shell/hush.c
index 27092c12f..6d472337f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2753,6 +2753,12 @@ static int i_getch(struct in_str *i)
                 if (ch != '\0') {
                         i->p++;
                         i->last_char = ch;
+#if ENABLE_HUSH_LINENO_VAR
+                        if (ch == '\n') {
+                                G.parse_lineno++;
+                                debug_printf_parse("G.parse_lineno++ = %u\n", G.parse_lineno);
+                        }
+#endif
                         return ch;
                 }
                 return EOF;
@@ -7540,11 +7546,11 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger)
 static void parse_and_run_string(const char *s)
 {
         struct in_str input;
-        //IF_HUSH_LINENO_VAR(unsigned sv = G.parse_lineno;)
+        IF_HUSH_LINENO_VAR(unsigned sv = G.parse_lineno;)
 
         setup_string_in_str(&input, s);
         parse_and_run_stream(&input, '\0');
-        //IF_HUSH_LINENO_VAR(G.parse_lineno = sv;)
+        IF_HUSH_LINENO_VAR(G.parse_lineno = sv;)
 }
 
 static void parse_and_run_file(HFILE *fp)
@@ -9898,7 +9904,8 @@ static int run_list(struct pipe *pi)
 #if ENABLE_HUSH_LOOPS
                 G.flag_break_continue = 0;
 #endif
-                rcode = r = run_pipe(pi); /* NB: rcode is a smalluint, r is int */
+                rcode = r = G.o_opt[OPT_O_NOEXEC] ? 0 : run_pipe(pi);
+                /* NB: rcode is a smalluint, r is int */
                 if (r != -1) {
                         /* We ran a builtin, function, or group.
                          * rcode is already known
@@ -10137,7 +10144,10 @@ static int set_mode(int state, char mode, const char *o_opt)
         int idx;
         switch (mode) {
         case 'n':
-                G.o_opt[OPT_O_NOEXEC] = state;
+                /* set -n has no effect in interactive shell */
+                /* Try: while set -n; do echo $-; done */
+                if (!G_interactive_fd)
+                        G.o_opt[OPT_O_NOEXEC] = state;
                 break;
         case 'x':
                 IF_HUSH_MODE_X(G_x_mode = state;)
diff --git a/shell/hush_test/hush-misc/exitcode_trap7.right b/shell/hush_test/hush-misc/exitcode_trap7.right
new file mode 100644
index 000000000..07d66e9d9
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap7.right
@@ -0,0 +1,2 @@
+Start
+Ok:0
diff --git a/shell/hush_test/hush-misc/exitcode_trap7.tests b/shell/hush_test/hush-misc/exitcode_trap7.tests
new file mode 100755
index 000000000..f4b0eb544
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap7.tests
@@ -0,0 +1,7 @@
+$THIS_SH -c '
+cleanup() { set +e; false; }
+set -e
+trap cleanup EXIT
+echo Start
+'
+echo Ok:$?
diff --git a/shell/hush_test/hush-misc/set-n1.right b/shell/hush_test/hush-misc/set-n1.right
new file mode 100644
index 000000000..ac01831a7
--- /dev/null
+++ b/shell/hush_test/hush-misc/set-n1.right
@@ -0,0 +1,3 @@
+set -n stops in -c?
+YES
+Ok:0
diff --git a/shell/hush_test/hush-misc/set-n1.tests b/shell/hush_test/hush-misc/set-n1.tests
new file mode 100755
index 000000000..90d0f9146
--- /dev/null
+++ b/shell/hush_test/hush-misc/set-n1.tests
@@ -0,0 +1,2 @@
+$THIS_SH -c "echo 'set -n stops in -c?'; set -n; echo NO" && echo YES
+echo Ok:$?
diff --git a/shell/hush_test/hush-vars/var_LINENO2.right b/shell/hush_test/hush-vars/var_LINENO2.right
new file mode 100644
index 000000000..73656647c
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO2.right
@@ -0,0 +1,3 @@
+Start LINENO=6, calling function
+In function: LINENO=4
+After function: LINENO=8
diff --git a/shell/hush_test/hush-vars/var_LINENO2.tests b/shell/hush_test/hush-vars/var_LINENO2.tests
new file mode 100755
index 000000000..7036dbdc8
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO2.tests
@@ -0,0 +1,8 @@
+#skip lines: make "line number within function" differ from overall line number
+#skip lines
+f() {
+        echo "In function: LINENO=$LINENO"
+}
+echo "Start LINENO=$LINENO, calling function"
+f
+echo "After function: LINENO=$LINENO"
diff --git a/shell/hush_test/hush-vars/var_LINENO3.right b/shell/hush_test/hush-vars/var_LINENO3.right
new file mode 100644
index 000000000..198c3cc99
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO3.right
@@ -0,0 +1,2 @@
+LINENO starts from 0 in -c
+and increments on next line: 1
diff --git a/shell/hush_test/hush-vars/var_LINENO3.tests b/shell/hush_test/hush-vars/var_LINENO3.tests
new file mode 100755
index 000000000..4502edfe0
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_LINENO3.tests
@@ -0,0 +1,2 @@
+$THIS_SH -c 'echo "LINENO starts from $LINENO in -c"
+echo "and increments on next line: $LINENO"'