get rid of global "struct bb_applet *current_applet"
[oweals/busybox.git] / shell / ash.c
index 7ffecf43d055f74f46e34f4b5ad1924e5f88033e..af96c4d1da2365077ce4fd4441db598219c9a07d 100644 (file)
 #if DEBUG
 #define _GNU_SOURCE
 #endif
-#include "busybox.h"
+#include "busybox.h" /* for struct bb_applet */
 #include <paths.h>
 #include <setjmp.h>
 #include <fnmatch.h>
 #if JOBS || ENABLE_ASH_READ_NCHARS
 #include <termios.h>
 #endif
+extern char **environ;
 
 #if defined(__uClinux__)
 #error "Do not even bother, ash will not run on uClinux"
 #endif
 
 
+/* ============ Misc helpers */
+
+#define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
+
+/* C99 say: "char" declaration may be signed or unsigned default */
+#define signed_char2int(sc) ((int)((signed char)sc))
+
+
 /* ============ Shell options */
 
 static const char *const optletters_optnames[] = {
@@ -82,19 +91,19 @@ static const char *const optletters_optnames[] = {
        "a"   "allexport",
        "b"   "notify",
        "u"   "nounset",
-       "\0"  "vi",
+       "\0"  "vi"
 #if DEBUG
-       "\0"  "nolog",
-       "\0"  "debug",
+       ,"\0"  "nolog"
+       ,"\0"  "debug"
 #endif
 };
 
 #define optletters(n) optletters_optnames[(n)][0]
 #define optnames(n) (&optletters_optnames[(n)][1])
 
-#define NOPTS (sizeof(optletters_optnames)/sizeof(optletters_optnames[0]))
+enum { NOPTS = ARRAY_SIZE(optletters_optnames) };
 
-static char optlist[NOPTS];
+static char optlist[NOPTS] ALIGN1;
 
 #define eflag optlist[0]
 #define fflag optlist[1]
@@ -118,19 +127,13 @@ static char optlist[NOPTS];
 
 /* ============ Misc data */
 
-#ifdef __GLIBC__
-/* glibc sucks */
-static int *dash_errno;
-#undef errno
-#define errno (*dash_errno)
-#endif
+static char nullstr[1] ALIGN1;  /* zero length string */
+static const char homestr[] ALIGN1 = "HOME";
+static const char snlfmt[] ALIGN1 = "%s\n";
+static const char illnum[] ALIGN1 = "Illegal number: %s";
 
-static char nullstr[1];                /* zero length string */
-static const char homestr[] = "HOME";
-static const char snlfmt[] = "%s\n";
-static const char illnum[] = "Illegal number: %s";
+static char *minusc;  /* argument to -c option */
 
-static int isloginsh;
 /* pid of main shell */
 static int rootpid;
 /* shell level: 0 for the main shell, 1 for its children, and so on */
@@ -138,6 +141,7 @@ static int shlvl;
 #define rootshell (!shlvl)
 /* trap handler commands */
 static char *trap[NSIG];
+static smallint isloginsh;
 /* current value of signal */
 static char sigmode[NSIG - 1];
 /* indicates specified signal received */
@@ -145,8 +149,9 @@ static char gotsig[NSIG - 1];
 static char *arg0; /* value of $0 */
 
 
-/* ============ Interrupts / exceptions
- *
+/* ============ Interrupts / exceptions */
+
+/*
  * We enclose jmp_buf in a structure so that we can declare pointers to
  * jump locations.  The global variable handler contains the location to
  * jump to when an exception occurs, and the global variable exception
@@ -172,7 +177,19 @@ static volatile sig_atomic_t intpending;
 /* do we generate EXSIG events */
 static int exsig;
 /* last pending signal */
-static volatile sig_atomic_t pendingsigs;
+static volatile sig_atomic_t pendingsig;
+
+/*
+ * Sigmode records the current value of the signal handlers for the various
+ * modes.  A value of zero means that the current handler is not known.
+ * S_HARD_IGN indicates that the signal was ignored on entry to the shell,
+ */
+
+#define S_DFL 1                 /* default signal handling (SIG_DFL) */
+#define S_CATCH 2               /* signal is caught */
+#define S_IGN 3                 /* signal is ignored (SIG_IGN) */
+#define S_HARD_IGN 4            /* signal is ignored permenantly */
+#define S_RESET 5               /* temporary - to reset a hard ignored sig */
 
 /*
  * These macros allow the user to suspend the handling of interrupt signals
@@ -180,13 +197,11 @@ static volatile sig_atomic_t pendingsigs;
  * much more efficient and portable.  (But hacking the kernel is so much
  * more fun than worrying about efficiency and portability. :-))
  */
-#define xbarrier() ({ __asm__ __volatile__ ("": : :"memory"); })
 #define INT_OFF \
-       ({ \
+       do { \
                suppressint++; \
                xbarrier(); \
-               0; \
-       })
+       } while (0)
 
 /*
  * Called to raise an exception.  Since C doesn't include exceptions, we
@@ -218,8 +233,15 @@ static void
 raise_interrupt(void)
 {
        int i;
+       sigset_t mask;
 
        intpending = 0;
+       /* Signal is not automatically re-enabled after it is raised,
+        * do it ourself */
+       sigemptyset(&mask);
+       sigprocmask(SIG_SETMASK, &mask, 0);
+       /* pendingsig = 0; - now done in onsig() */
+
        i = EXSIG;
        if (gotsig[SIGINT - 1] && !trap[SIGINT]) {
                if (!(rootshell && iflag)) {
@@ -251,42 +273,71 @@ force_int_on(void)
 #define FORCE_INT_ON force_int_on()
 #else
 #define INT_ON \
-       ({ \
+       do { \
                xbarrier(); \
-               if (--suppressint == 0 && intpending) raise_interrupt(); \
-               0; \
-       })
+               if (--suppressint == 0 && intpending) \
+                       raise_interrupt(); \
+       } while (0)
 #define FORCE_INT_ON \
-       ({ \
+       do { \
                xbarrier(); \
                suppressint = 0; \
-               if (intpending) raise_interrupt(); \
-               0; \
-       })
+               if (intpending) \
+                       raise_interrupt(); \
+       } while (0)
 #endif /* ASH_OPTIMIZE_FOR_SIZE */
 
 #define SAVE_INT(v) ((v) = suppressint)
 
 #define RESTORE_INT(v) \
-       ({ \
+       do { \
                xbarrier(); \
                suppressint = (v); \
-               if (suppressint == 0 && intpending) raise_interrupt(); \
-               0; \
-       })
+               if (suppressint == 0 && intpending) \
+                       raise_interrupt(); \
+       } while (0)
 
 #define EXSIGON \
-       ({ \
+       do { \
                exsig++; \
                xbarrier(); \
-               if (pendingsigs) \
+               if (pendingsig) \
                        raise_exception(EXSIG); \
-               0; \
-       })
+       } while (0)
 /* EXSIG is turned off by evalbltin(). */
 
+/*
+ * Ignore a signal. Only one usage site - in forkchild()
+ */
+static void
+ignoresig(int signo)
+{
+       if (sigmode[signo - 1] != S_IGN && sigmode[signo - 1] != S_HARD_IGN) {
+               signal(signo, SIG_IGN);
+       }
+       sigmode[signo - 1] = S_HARD_IGN;
+}
+
+/*
+ * Signal handler. Only one usage site - in setsignal()
+ */
+static void
+onsig(int signo)
+{
+       gotsig[signo - 1] = 1;
+       pendingsig = signo;
+
+       if (exsig || (signo == SIGINT && !trap[SIGINT])) {
+               if (!suppressint) {
+                       pendingsig = 0;
+                       raise_interrupt();
+               }
+               intpending = 1;
+       }
+}
+
 
-/* ============ stdout/stderr output */
+/* ============ Stdout/stderr output */
 
 static void
 outstr(const char *p, FILE *file)
@@ -366,7 +417,40 @@ out2str(const char *p)
 }
 
 
-/* ============ Parsing structures */
+/* ============ Parser structures */
+
+/* control characters in argument strings */
+#define CTLESC '\201'           /* escape next character */
+#define CTLVAR '\202'           /* variable defn */
+#define CTLENDVAR '\203'
+#define CTLBACKQ '\204'
+#define CTLQUOTE 01             /* ored with CTLBACKQ code if in quotes */
+/*      CTLBACKQ | CTLQUOTE == '\205' */
+#define CTLARI  '\206'          /* arithmetic expression */
+#define CTLENDARI '\207'
+#define CTLQUOTEMARK '\210'
+
+/* variable substitution byte (follows CTLVAR) */
+#define VSTYPE  0x0f            /* type of variable substitution */
+#define VSNUL   0x10            /* colon--treat the empty string as unset */
+#define VSQUOTE 0x80            /* inside double quotes--suppress splitting */
+
+/* values of VSTYPE field */
+#define VSNORMAL        0x1             /* normal variable:  $var or ${var} */
+#define VSMINUS         0x2             /* ${var-text} */
+#define VSPLUS          0x3             /* ${var+text} */
+#define VSQUESTION      0x4             /* ${var?message} */
+#define VSASSIGN        0x5             /* ${var=text} */
+#define VSTRIMRIGHT     0x6             /* ${var%pattern} */
+#define VSTRIMRIGHTMAX  0x7             /* ${var%%pattern} */
+#define VSTRIMLEFT      0x8             /* ${var#pattern} */
+#define VSTRIMLEFTMAX   0x9             /* ${var##pattern} */
+#define VSLENGTH        0xa             /* ${#var} */
+
+static const char dolatstr[] ALIGN1 = {
+       CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'
+};
+
 #define NCMD 0
 #define NPIPE 1
 #define NREDIR 2
@@ -510,6 +594,16 @@ struct funcnode {
        union node n;
 };
 
+/*
+ * Free a parse tree.
+ */
+static void
+freefunc(struct funcnode *f)
+{
+       if (f && --f->count < 0)
+               free(f);
+}
+
 
 /* ============ Debugging output */
 
@@ -632,7 +726,7 @@ opentrace(void)
                }
        }
 #ifdef O_APPEND
-       flags = fcntl(fileno(tracefile), F_GETFL, 0);
+       flags = fcntl(fileno(tracefile), F_GETFL);
        if (flags >= 0)
                fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
 #endif
@@ -748,23 +842,24 @@ shcmd(union node *cmd, FILE *fp)
 
        first = 1;
        for (np = cmd->ncmd.args; np; np = np->narg.next) {
-               if (! first)
-                       putchar(' ');
+               if (!first)
+                       putc(' ', fp);
                sharg(np, fp);
                first = 0;
        }
        for (np = cmd->ncmd.redirect; np; np = np->nfile.next) {
-               if (! first)
-                       putchar(' ');
+               if (!first)
+                       putc(' ', fp);
+               dftfd = 0;
                switch (np->nfile.type) {
-               case NTO:       s = ">";  dftfd = 1; break;
-               case NCLOBBER:  s = ">|"; dftfd = 1; break;
-               case NAPPEND:   s = ">>"; dftfd = 1; break;
-               case NTOFD:     s = ">&"; dftfd = 1; break;
-               case NFROM:     s = "<";  dftfd = 0; break;
-               case NFROMFD:   s = "<&"; dftfd = 0; break;
-               case NFROMTO:   s = "<>"; dftfd = 0; break;
-               default:        s = "*error*"; dftfd = 0; break;
+               case NTO:      s = ">>"+1; dftfd = 1; break;
+               case NCLOBBER: s = ">|"; dftfd = 1; break;
+               case NAPPEND:  s = ">>"; dftfd = 1; break;
+               case NTOFD:    s = ">&"; dftfd = 1; break;
+               case NFROM:    s = "<";  break;
+               case NFROMFD:  s = "<&"; break;
+               case NFROMTO:  s = "<>"; break;
+               default:       s = "*error*"; break;
                }
                if (np->nfile.fd != dftfd)
                        fprintf(fp, "%d", np->nfile.fd);
@@ -845,23 +940,18 @@ showtree(union node *n)
 #endif /* DEBUG */
 
 
-/* ============ Parser data
- *
+/* ============ Parser data */
+
+/*
  * ash_vmsg() needs parsefile->fd, hence parsefile definition is moved up.
  */
-
 struct strlist {
        struct strlist *next;
        char *text;
 };
 
 #if ENABLE_ASH_ALIAS
-#define ALIASINUSE 1
-#define ALIASDEAD  2
 struct alias;
-static int aliascmd(int, char **);
-static int unaliascmd(int, char **);
-static void printalias(const struct alias *);
 #endif
 
 struct strpush {
@@ -892,7 +982,6 @@ static int startlinno;                 /* line # where last token started */
 static char *commandname;              /* currently executing command */
 static struct strlist *cmdenviron;     /* environment for builtin command */
 static int exitstatus;                 /* exit status of last command */
-static int back_exitstatus;            /* exit status of backquoted command */
 
 
 /* ============ Message printing */
@@ -902,9 +991,10 @@ ash_vmsg(const char *msg, va_list ap)
 {
        fprintf(stderr, "%s: ", arg0);
        if (commandname) {
-               const char *fmt = (!iflag || parsefile->fd) ?
-                                       "%s: %d: " : "%s: ";
-               fprintf(stderr, fmt, commandname, startlinno);
+               if (strcmp(arg0, commandname))
+                       fprintf(stderr, "%s: ", commandname);
+               if (!iflag || parsefile->fd)
+                       fprintf(stderr, "line %d: ", startlinno);
        }
        vfprintf(stderr, msg, ap);
        outcslow('\n', stderr);
@@ -1132,6 +1222,9 @@ popstackmark(struct stackmark *mark)
 {
        struct stack_block *sp;
 
+       if (!mark->stackp)
+               return;
+
        INT_OFF;
        markp = mark->marknext;
        while (stackp != mark->stackp) {
@@ -1288,21 +1381,25 @@ _STPUTC(int c, char *p)
        return p;
 }
 
-#define STARTSTACKSTR(p) ((p) = stackblock())
-#define STPUTC(c, p) ((p) = _STPUTC((c), (p)))
+#define STARTSTACKSTR(p)        ((p) = stackblock())
+#define STPUTC(c, p)            ((p) = _STPUTC((c), (p)))
 #define CHECKSTRSPACE(n, p) \
-       ({ \
+       do { \
                char *q = (p); \
                size_t l = (n); \
                size_t m = sstrend - q; \
                if (l > m) \
                        (p) = makestrspace(l, q); \
-               0; \
-       })
+       } while (0)
 #define USTPUTC(c, p)           (*p++ = (c))
-#define STACKSTRNUL(p)          ((p) == sstrend ? (p = growstackstr(), *p = '\0') : (*p = '\0'))
+#define STACKSTRNUL(p) \
+       do { \
+               if ((p) == sstrend) \
+                       p = growstackstr(); \
+               *p = '\0'; \
+       } while (0)
 #define STUNPUTC(p)             (--p)
-#define STTOPC(p)               p[-1]
+#define STTOPC(p)               (p[-1])
 #define STADJUST(amount, p)     (p += (amount))
 
 #define grabstackstr(p)         stalloc((char *)(p) - (char *)stackblock())
@@ -1396,7 +1493,7 @@ single_quote(const char *s)
 }
 
 
-/* ============ ... */
+/* ============ nextopt */
 
 static char **argptr;                  /* argument list for builtin commands */
 static char *optionarg;                /* set by nextopt (like getopt) */
@@ -1431,13 +1528,13 @@ nextopt(const char *optstring)
        c = *p++;
        for (q = optstring; *q != c; ) {
                if (*q == '\0')
-                       ash_msg_and_raise_error("Illegal option -%c", c);
+                       ash_msg_and_raise_error("illegal option -%c", c);
                if (*++q == ':')
                        q++;
        }
        if (*++q == ':') {
                if (*p == '\0' && (p = *argptr++) == NULL)
-                       ash_msg_and_raise_error("No arg for -%c option", c);
+                       ash_msg_and_raise_error("no arg for -%c option", c);
                optionarg = p;
                p = NULL;
        }
@@ -1446,7 +1543,30 @@ nextopt(const char *optstring)
 }
 
 
-/* ============ Variables */
+/* ============ Math support definitions */
+
+#if ENABLE_ASH_MATH_SUPPORT_64
+typedef int64_t arith_t;
+#define arith_t_type long long
+#else
+typedef long arith_t;
+#define arith_t_type long
+#endif
+
+#if ENABLE_ASH_MATH_SUPPORT
+static arith_t dash_arith(const char *);
+static arith_t arith(const char *expr, int *perrcode);
+#endif
+
+#if ENABLE_ASH_RANDOM_SUPPORT
+static unsigned long rseed;
+#ifndef DYNAMIC_VAR
+#define DYNAMIC_VAR
+#endif
+#endif
+
+
+/* ============ Shell variables */
 
 /* flags */
 #define VEXPORT         0x01    /* variable is exported */
@@ -1459,22 +1579,52 @@ nextopt(const char *optstring)
 #define VNOSET          0x80    /* do not set variable - just readonly test */
 #define VNOSAVE         0x100   /* when text is on the heap before setvareq */
 #ifdef DYNAMIC_VAR
-# define VDYNAMIC        0x200   /* dynamic variable */
-# else
-# define VDYNAMIC        0
-#endif
-
-#if ENABLE_LOCALE_SUPPORT
-static void change_lc_all(const char *value);
-static void change_lc_ctype(const char *value);
+# define VDYNAMIC       0x200   /* dynamic variable */
+#else
+# define VDYNAMIC       0
 #endif
 
-static const char defpathvar[] = "PATH=/usr/local/bin:/usr/bin:/sbin:/bin";
 #ifdef IFS_BROKEN
-static const char defifsvar[] = "IFS= \t\n";
+static const char defifsvar[] ALIGN1 = "IFS= \t\n";
 #define defifs (defifsvar + 4)
 #else
-static const char defifs[] = " \t\n";
+static const char defifs[] ALIGN1 = " \t\n";
+#endif
+
+struct shparam {
+       int nparam;             /* # of positional parameters (without $0) */
+       unsigned char malloc;   /* if parameter list dynamically allocated */
+       char **p;               /* parameter list */
+#if ENABLE_ASH_GETOPTS
+       int optind;             /* next parameter to be processed by getopts */
+       int optoff;             /* used by getopts */
+#endif
+};
+
+static struct shparam shellparam;      /* $@ current positional parameters */
+
+/*
+ * Free the list of positional parameters.
+ */
+static void
+freeparam(volatile struct shparam *param)
+{
+       char **ap;
+
+       if (param->malloc) {
+               for (ap = param->p; *ap; ap++)
+                       free(*ap);
+               free(param->p);
+       }
+}
+
+#if ENABLE_ASH_GETOPTS
+static void
+getoptsreset(const char *value)
+{
+       shellparam.optind = number(value);
+       shellparam.optoff = -1;
+}
 #endif
 
 struct var {
@@ -1493,46 +1643,55 @@ struct localvar {
 };
 
 /* Forward decls for varinit[] */
+#if ENABLE_LOCALE_SUPPORT
+static void
+change_lc_all(const char *value)
+{
+       if (value && *value != '\0')
+               setlocale(LC_ALL, value);
+}
+static void
+change_lc_ctype(const char *value)
+{
+       if (value && *value != '\0')
+               setlocale(LC_CTYPE, value);
+}
+#endif
 #if ENABLE_ASH_MAIL
 static void chkmail(void);
 static void changemail(const char *);
 #endif
 static void changepath(const char *);
-#if ENABLE_ASH_GETOPTS
-static void getoptsreset(const char *);
-#endif
 #if ENABLE_ASH_RANDOM_SUPPORT
 static void change_random(const char *);
 #endif
 
 static struct var varinit[] = {
 #ifdef IFS_BROKEN
-       { 0,    VSTRFIXED|VTEXTFIXED,           defifsvar,      0 },
+       { NULL, VSTRFIXED|VTEXTFIXED,           defifsvar,      NULL },
 #else
-       { 0,    VSTRFIXED|VTEXTFIXED|VUNSET,    "IFS\0",        0 },
+       { NULL, VSTRFIXED|VTEXTFIXED|VUNSET,    "IFS\0",        NULL },
 #endif
-
 #if ENABLE_ASH_MAIL
-       { 0,    VSTRFIXED|VTEXTFIXED|VUNSET,    "MAIL\0",       changemail },
-       { 0,    VSTRFIXED|VTEXTFIXED|VUNSET,    "MAILPATH\0",   changemail },
+       { NULL, VSTRFIXED|VTEXTFIXED|VUNSET,    "MAIL\0",       changemail },
+       { NULL, VSTRFIXED|VTEXTFIXED|VUNSET,    "MAILPATH\0",   changemail },
 #endif
-
-       { 0,    VSTRFIXED|VTEXTFIXED,           defpathvar,     changepath },
-       { 0,    VSTRFIXED|VTEXTFIXED,           "PS1=$ ",       0          },
-       { 0,    VSTRFIXED|VTEXTFIXED,           "PS2=> ",       0          },
-       { 0,    VSTRFIXED|VTEXTFIXED,           "PS4=+ ",       0          },
+       { NULL, VSTRFIXED|VTEXTFIXED,           bb_PATH_root_path, changepath },
+       { NULL, VSTRFIXED|VTEXTFIXED,           "PS1=$ ",       NULL },
+       { NULL, VSTRFIXED|VTEXTFIXED,           "PS2=> ",       NULL },
+       { NULL, VSTRFIXED|VTEXTFIXED,           "PS4=+ ",       NULL },
 #if ENABLE_ASH_GETOPTS
-       { 0,    VSTRFIXED|VTEXTFIXED,           "OPTIND=1",     getoptsreset },
+       { NULL, VSTRFIXED|VTEXTFIXED,           "OPTIND=1",     getoptsreset },
 #endif
 #if ENABLE_ASH_RANDOM_SUPPORT
-       {0, VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM\0", change_random },
+       { NULL, VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM\0", change_random },
 #endif
 #if ENABLE_LOCALE_SUPPORT
-       {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_ALL\0", change_lc_all },
-       {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_CTYPE\0", change_lc_ctype },
+       { NULL, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_ALL\0",    change_lc_all },
+       { NULL, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_CTYPE\0",  change_lc_ctype },
 #endif
 #if ENABLE_FEATURE_EDITING_SAVEHISTORY
-       {0, VSTRFIXED | VTEXTFIXED | VUNSET, "HISTFILE\0", NULL },
+       { NULL, VSTRFIXED | VTEXTFIXED | VUNSET, "HISTFILE\0",  NULL },
 #endif
 };
 
@@ -1553,7 +1712,6 @@ static struct var varinit[] = {
 #else
 #define vrandom (&vps4)[1]
 #endif
-#define defpath (defpathvar + 5)
 
 /*
  * The following macros access the values of the above variables.
@@ -1572,10 +1730,6 @@ static struct var varinit[] = {
 
 #define mpathset()      ((vmpath.flags & VUNSET) == 0)
 
-static struct var **hashvar(const char *);
-
-static int loopnest;            /* current loop nesting level */
-
 /*
  * The parsefile structure pointed to by the global variable parsefile
  * contains information about the current file being read.
@@ -1588,36 +1742,12 @@ struct redirtab {
 
 static struct redirtab *redirlist;
 static int nullredirs;
-
-extern char **environ;
-
 static int preverrout_fd;   /* save fd2 before print debug if xflag is set. */
 
-struct shparam {
-       int nparam;             /* # of positional parameters (without $0) */
-       unsigned char malloc;   /* if parameter list dynamically allocated */
-       char **p;               /* parameter list */
-#if ENABLE_ASH_GETOPTS
-       int optind;             /* next parameter to be processed by getopts */
-       int optoff;             /* used by getopts */
-#endif
-};
-
-static struct shparam shellparam;      /* $@ current positional parameters */
-
 #define VTABSIZE 39
 
 static struct var *vartab[VTABSIZE];
 
-#if ENABLE_ASH_GETOPTS
-static void
-getoptsreset(const char *value)
-{
-       shellparam.optind = number(value);
-       shellparam.optoff = -1;
-}
-#endif
-
 #define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
 #define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
 
@@ -1710,7 +1840,7 @@ initvar(void)
                vps1.text = "PS1=# ";
 #endif
        vp = varinit;
-       end = vp + sizeof(varinit) / sizeof(varinit[0]);
+       end = vp + ARRAY_SIZE(varinit);
        do {
                vpp = hashvar(vp->text);
                vp->next = *vpp;
@@ -2022,8 +2152,8 @@ padvance(const char **path, const char *name)
 
 /* ============ Prompt */
 
-static int doprompt;                   /* if set, prompt the user */
-static int needprompt;                 /* true if interactive and at start of line */
+static smallint doprompt;                   /* if set, prompt the user */
+static smallint needprompt;                 /* true if interactive and at start of line */
 
 #if ENABLE_FEATURE_EDITING
 static line_input_t *line_input_state;
@@ -2033,7 +2163,7 @@ putprompt(const char *s)
 {
        if (ENABLE_ASH_EXPAND_PRMT) {
                free((char*)cmdedit_prompt);
-               cmdedit_prompt = xstrdup(s);
+               cmdedit_prompt = ckstrdup(s);
                return;
        }
        cmdedit_prompt = s;
@@ -2157,7 +2287,8 @@ updatepwd(const char *dir)
                                                break;
                                }
                                break;
-                       } else if (p[1] == '\0')
+                       }
+                       if (p[1] == '\0')
                                break;
                        /* fall through */
                default:
@@ -2325,344 +2456,111 @@ pwdcmd(int argc, char **argv)
 }
 
 
-/* ============ Unsorted yet */
-
+/* ============ ... */
 
-/*      expand.h     */
+#define IBUFSIZ COMMON_BUFSIZE
+#define basebuf bb_common_bufsiz1       /* buffer for top level input file */
 
-struct arglist {
-       struct strlist *list;
-       struct strlist **lastp;
-};
+/* Syntax classes */
+#define CWORD 0                 /* character is nothing special */
+#define CNL 1                   /* newline character */
+#define CBACK 2                 /* a backslash character */
+#define CSQUOTE 3               /* single quote */
+#define CDQUOTE 4               /* double quote */
+#define CENDQUOTE 5             /* a terminating quote */
+#define CBQUOTE 6               /* backwards single quote */
+#define CVAR 7                  /* a dollar sign */
+#define CENDVAR 8               /* a '}' character */
+#define CLP 9                   /* a left paren in arithmetic */
+#define CRP 10                  /* a right paren in arithmetic */
+#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 */
 
-/*
- * expandarg() flags
- */
-#define EXP_FULL        0x1     /* perform word splitting & file globbing */
-#define EXP_TILDE       0x2     /* do normal tilde expansion */
-#define EXP_VARTILDE    0x4     /* expand tildes in an assignment */
-#define EXP_REDIR       0x8     /* file glob for a redirection (1 match only) */
-#define EXP_CASE        0x10    /* keeps quotes around for CASE pattern */
-#define EXP_RECORD      0x20    /* need to record arguments for ifs breakup */
-#define EXP_VARTILDE2   0x40    /* expand tildes after colons only */
-#define EXP_WORD        0x80    /* expand word in parameter expansion */
-#define EXP_QWORD       0x100   /* expand word in quoted parameter expansion */
+#if ENABLE_ASH_ALIAS
+#define SYNBASE 130
+#define PEOF -130
+#define PEOA -129
+#define PEOA_OR_PEOF PEOA
+#else
+#define SYNBASE 129
+#define PEOF -129
+#define PEOA_OR_PEOF PEOF
+#endif
 
+/* number syntax index */
+#define BASESYNTAX 0    /* not in quotes */
+#define DQSYNTAX   1    /* in double quotes */
+#define SQSYNTAX   2    /* in single quotes */
+#define ARISYNTAX  3    /* in arithmetic */
+#define PSSYNTAX   4    /* prompt */
 
-static void expandarg(union node *, struct arglist *, int);
-#define rmescapes(p) _rmescapes((p), 0)
-static char *_rmescapes(char *, int);
-static int casematch(union node *, char *);
+#if ENABLE_ASH_OPTIMIZE_FOR_SIZE
+#define USE_SIT_FUNCTION
+#endif
 
 #if ENABLE_ASH_MATH_SUPPORT
-static void expari(int);
-#endif
-
-/*      eval.h       */
-
-
-
-struct backcmd {                /* result of evalbackcmd */
-       int fd;                 /* file descriptor to read from */
-       char *buf;              /* buffer */
-       int nleft;              /* number of chars in buffer */
-       struct job *jp;         /* job structure for command */
-};
-
-
-static void freefunc(struct funcnode *);
-/*      parser.h     */
-
-/* control characters in argument strings */
-#define CTL_FIRST '\201'        /* first 'special' character */
-#define CTLESC '\201'           /* escape next character */
-#define CTLVAR '\202'           /* variable defn */
-#define CTLENDVAR '\203'
-#define CTLBACKQ '\204'
-#define CTLQUOTE 01             /* ored with CTLBACKQ code if in quotes */
-/*      CTLBACKQ | CTLQUOTE == '\205' */
-#define CTLARI  '\206'          /* arithmetic expression */
-#define CTLENDARI '\207'
-#define CTLQUOTEMARK '\210'
-#define CTL_LAST '\210'         /* last 'special' character */
-
-/* variable substitution byte (follows CTLVAR) */
-#define VSTYPE  0x0f            /* type of variable substitution */
-#define VSNUL   0x10            /* colon--treat the empty string as unset */
-#define VSQUOTE 0x80            /* inside double quotes--suppress splitting */
-
-/* values of VSTYPE field */
-#define VSNORMAL        0x1             /* normal variable:  $var or ${var} */
-#define VSMINUS         0x2             /* ${var-text} */
-#define VSPLUS          0x3             /* ${var+text} */
-#define VSQUESTION      0x4             /* ${var?message} */
-#define VSASSIGN        0x5             /* ${var=text} */
-#define VSTRIMRIGHT     0x6             /* ${var%pattern} */
-#define VSTRIMRIGHTMAX  0x7             /* ${var%%pattern} */
-#define VSTRIMLEFT      0x8             /* ${var#pattern} */
-#define VSTRIMLEFTMAX   0x9             /* ${var##pattern} */
-#define VSLENGTH        0xa             /* ${#var} */
-
-/* values of checkkwd variable */
-#define CHKALIAS        0x1
-#define CHKKWD          0x2
-#define CHKNL           0x4
-
-#define IBUFSIZ (BUFSIZ + 1)
-
-/*
- * NEOF is returned by parsecmd when it encounters an end of file.  It
- * must be distinct from NULL, so we use the address of a variable that
- * happens to be handy.
- */
-static int plinno = 1;                  /* input line number */
-
-/* number of characters left in input buffer */
-static int parsenleft;                  /* copy of parsefile->nleft */
-static int parselleft;                  /* copy of parsefile->lleft */
-
-/* next character in input buffer */
-static char *parsenextc;                /* copy of parsefile->nextc */
-
-#define basebuf bb_common_bufsiz1       /* buffer for top level input file */
-
-
-static int tokpushback;                 /* last token pushed back */
-#define NEOF ((union node *)&tokpushback)
-static int parsebackquote;             /* nonzero if we are inside backquotes */
-static int lasttoken;                  /* last token read */
-static char *wordtext;                 /* text of last word returned by readtoken */
-static int checkkwd;
-static struct nodelist *backquotelist;
-static union node *redirnode;
-static struct heredoc *heredoc;
-static int quoteflag;                  /* set if (part of) last token was quoted */
-
-static void fixredir(union node *, const char *, int);
-static char *endofname(const char *);
-
-/*      shell.h   */
-
-static const char spcstr[] = " ";
-static const char dolatstr[] = { CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0' };
-
-#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(x, expected_value) (x)
-#endif
-
-#define xlikely(x)       __builtin_expect((x),1)
-
-
-#define TEOF 0
-#define TNL 1
-#define TREDIR 2
-#define TWORD 3
-#define TSEMI 4
-#define TBACKGND 5
-#define TAND 6
-#define TOR 7
-#define TPIPE 8
-#define TLP 9
-#define TRP 10
-#define TENDCASE 11
-#define TENDBQUOTE 12
-#define TNOT 13
-#define TCASE 14
-#define TDO 15
-#define TDONE 16
-#define TELIF 17
-#define TELSE 18
-#define TESAC 19
-#define TFI 20
-#define TFOR 21
-#define TIF 22
-#define TIN 23
-#define TTHEN 24
-#define TUNTIL 25
-#define TWHILE 26
-#define TBEGIN 27
-#define TEND 28
-
-/* first char is indicating which tokens mark the end of a list */
-static const char *const tokname_array[] = {
-       "\1end of file",
-       "\0newline",
-       "\0redirection",
-       "\0word",
-       "\0;",
-       "\0&",
-       "\0&&",
-       "\0||",
-       "\0|",
-       "\0(",
-       "\1)",
-       "\1;;",
-       "\1`",
-#define KWDOFFSET 13
-       /* the following are keywords */
-       "\0!",
-       "\0case",
-       "\1do",
-       "\1done",
-       "\1elif",
-       "\1else",
-       "\1esac",
-       "\1fi",
-       "\0for",
-       "\0if",
-       "\0in",
-       "\1then",
-       "\0until",
-       "\0while",
-       "\0{",
-       "\1}",
-};
-
-static const char *
-tokname(int tok)
-{
-       static char buf[16];
-
-       if (tok >= TSEMI)
-               buf[0] = '"';
-       sprintf(buf + (tok >= TSEMI), "%s%c",
-                       tokname_array[tok] + 1, (tok >= TSEMI ? '"' : 0));
-       return buf;
-}
-
-/* Wrapper around strcmp for qsort/bsearch/... */
-static int
-pstrcmp(const void *a, const void *b)
-{
-       return strcmp((const char *) a, (*(const char *const *) b) + 1);
-}
-
-static const char *const *
-findkwd(const char *s)
-{
-       return bsearch(s, tokname_array + KWDOFFSET,
-                       (sizeof(tokname_array) / sizeof(const char *)) - KWDOFFSET,
-                       sizeof(const char *), pstrcmp);
-}
-
-/* Syntax classes */
-#define CWORD 0                 /* character is nothing special */
-#define CNL 1                   /* newline character */
-#define CBACK 2                 /* a backslash character */
-#define CSQUOTE 3               /* single quote */
-#define CDQUOTE 4               /* double quote */
-#define CENDQUOTE 5             /* a terminating quote */
-#define CBQUOTE 6               /* backwards single quote */
-#define CVAR 7                  /* a dollar sign */
-#define CENDVAR 8               /* a '}' character */
-#define CLP 9                   /* a left paren in arithmetic */
-#define CRP 10                  /* a right paren in arithmetic */
-#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 */
-
-#if ENABLE_ASH_ALIAS
-#define SYNBASE 130
-#define PEOF -130
-#define PEOA -129
-#define PEOA_OR_PEOF PEOA
-#else
-#define SYNBASE 129
-#define PEOF -129
-#define PEOA_OR_PEOF PEOF
-#endif
-
-/* C99 say: "char" declaration may be signed or unsigned default */
-#define SC2INT(chr2may_be_negative_int) (int)((signed char)chr2may_be_negative_int)
-
-/*
- * is_special(c) evaluates to 1 for c in "!#$*-0123456789?@"; 0 otherwise
- * (assuming ascii char codes, as the original implementation did)
- */
-#define is_special(c) \
-       ( (((unsigned int)c) - 33 < 32) \
-                        && ((0xc1ff920dUL >> (((unsigned int)c) - 33)) & 1))
-
-#define digit_val(c)    ((c) - '0')
-
-/*
- * This file was generated by the mksyntax program.
- */
-
-#if ENABLE_ASH_OPTIMIZE_FOR_SIZE
-#define USE_SIT_FUNCTION
-#endif
-
-/* number syntax index */
-#define  BASESYNTAX  0  /* not in quotes */
-#define  DQSYNTAX    1  /* in double quotes */
-#define  SQSYNTAX    2  /* in single quotes */
-#define  ARISYNTAX   3  /* in arithmetic */
-
-#if ENABLE_ASH_MATH_SUPPORT
-static const char S_I_T[][4] = {
-#if ENABLE_ASH_ALIAS
-       {CSPCL, CIGN, CIGN, CIGN},              /* 0, PEOA */
-#endif
-       {CSPCL, CWORD, CWORD, CWORD},           /* 1, ' ' */
-       {CNL, CNL, CNL, CNL},                   /* 2, \n */
-       {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, } */
-#ifndef USE_SIT_FUNCTION
-       {CENDFILE, CENDFILE, CENDFILE, CENDFILE},       /* 12, PEOF */
-       {CWORD, CWORD, CWORD, CWORD},           /* 13, 0-9A-Za-z */
-       {CCTL, CCTL, CCTL, CCTL}                /* 14, CTLESC ... */
+static const char S_I_T[][4] = {
+#if ENABLE_ASH_ALIAS
+       { CSPCL, CIGN, CIGN, CIGN },            /* 0, PEOA */
+#endif
+       { CSPCL, CWORD, CWORD, CWORD },         /* 1, ' ' */
+       { CNL, CNL, CNL, CNL },                 /* 2, \n */
+       { 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, } */
+#ifndef USE_SIT_FUNCTION
+       { CENDFILE, CENDFILE, CENDFILE, CENDFILE }, /* 12, PEOF */
+       { CWORD, CWORD, CWORD, CWORD },         /* 13, 0-9A-Za-z */
+       { CCTL, CCTL, CCTL, CCTL }              /* 14, CTLESC ... */
 #endif
 };
 #else
 static const char S_I_T[][3] = {
 #if ENABLE_ASH_ALIAS
-       {CSPCL, CIGN, CIGN},                    /* 0, PEOA */
-#endif
-       {CSPCL, CWORD, CWORD},                  /* 1, ' ' */
-       {CNL, CNL, CNL},                        /* 2, \n */
-       {CWORD, CCTL, CCTL},                    /* 3, !*-/:=?[]~ */
-       {CDQUOTE, CENDQUOTE, CWORD},            /* 4, '"' */
-       {CVAR, CVAR, CWORD},                    /* 5, $ */
-       {CSQUOTE, CWORD, CENDQUOTE},            /* 6, "'" */
-       {CSPCL, CWORD, CWORD},                  /* 7, ( */
-       {CSPCL, CWORD, CWORD},                  /* 8, ) */
-       {CBACK, CBACK, CCTL},                   /* 9, \ */
-       {CBQUOTE, CBQUOTE, CWORD},              /* 10, ` */
-       {CENDVAR, CENDVAR, CWORD},              /* 11, } */
+       { CSPCL, CIGN, CIGN },                  /* 0, PEOA */
+#endif
+       { CSPCL, CWORD, CWORD },                /* 1, ' ' */
+       { CNL, CNL, CNL },                      /* 2, \n */
+       { CWORD, CCTL, CCTL },                  /* 3, !*-/:=?[]~ */
+       { CDQUOTE, CENDQUOTE, CWORD },          /* 4, '"' */
+       { CVAR, CVAR, CWORD },                  /* 5, $ */
+       { CSQUOTE, CWORD, CENDQUOTE },          /* 6, "'" */
+       { CSPCL, CWORD, CWORD },                /* 7, ( */
+       { CSPCL, CWORD, CWORD },                /* 8, ) */
+       { CBACK, CBACK, CCTL },                 /* 9, \ */
+       { CBQUOTE, CBQUOTE, CWORD },            /* 10, ` */
+       { CENDVAR, CENDVAR, CWORD },            /* 11, } */
 #ifndef USE_SIT_FUNCTION
-       {CENDFILE, CENDFILE, CENDFILE},         /* 12, PEOF */
-       {CWORD, CWORD, CWORD},                  /* 13, 0-9A-Za-z */
-       {CCTL, CCTL, CCTL}                      /* 14, CTLESC ... */
+       { CENDFILE, CENDFILE, CENDFILE },       /* 12, PEOF */
+       { CWORD, CWORD, CWORD },                /* 13, 0-9A-Za-z */
+       { CCTL, CCTL, CCTL }                    /* 14, CTLESC ... */
 #endif
 };
 #endif /* ASH_MATH_SUPPORT */
 
 #ifdef USE_SIT_FUNCTION
 
-#define U_C(c) ((unsigned char)(c))
-
 static int
 SIT(int c, int syntax)
 {
-       static const char spec_symbls[] = "\t\n !\"$&'()*-/:;<=>?[\\]`|}~";
+       static const char spec_symbls[] ALIGN1 = "\t\n !\"$&'()*-/:;<=>?[\\]`|}~";
 #if ENABLE_ASH_ALIAS
-       static const char syntax_index_table[] = {
+       static const char 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 char syntax_index_table[] = {
+       static const char 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,         /* "=>?[\\]`|" */
@@ -2679,9 +2577,13 @@ SIT(int c, int syntax)
                indx = 0;
        else
 #endif
-       if (U_C(c) >= U_C(CTLESC) && U_C(c) <= U_C(CTLQUOTEMARK))
+#define U_C(c) ((unsigned char)(c))
+
+       if ((unsigned char)c >= (unsigned char)(CTLESC)
+        && (unsigned char)c <= (unsigned char)(CTLQUOTEMARK)
+       ) {
                return CCTL;
-       else {
+       else {
                s = strchr(spec_symbls, c);
                if (s == NULL || *s == '\0')
                        return CWORD;
@@ -2690,41 +2592,39 @@ SIT(int c, int syntax)
        return S_I_T[indx][syntax];
 }
 
-#else   /* USE_SIT_FUNCTION */
-
-#define SIT(c, syntax) S_I_T[(int)syntax_index_table[((int)c)+SYNBASE]][syntax]
+#else   /* !USE_SIT_FUNCTION */
 
 #if ENABLE_ASH_ALIAS
-#define CSPCL_CIGN_CIGN_CIGN                           0
-#define CSPCL_CWORD_CWORD_CWORD                        1
-#define CNL_CNL_CNL_CNL                                2
-#define CWORD_CCTL_CCTL_CWORD                          3
-#define CDQUOTE_CENDQUOTE_CWORD_CWORD                  4
-#define CVAR_CVAR_CWORD_CVAR                           5
-#define CSQUOTE_CWORD_CENDQUOTE_CWORD                  6
-#define CSPCL_CWORD_CWORD_CLP                          7
-#define CSPCL_CWORD_CWORD_CRP                          8
-#define CBACK_CBACK_CCTL_CBACK                         9
-#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE                 10
-#define CENDVAR_CENDVAR_CWORD_CENDVAR                 11
-#define CENDFILE_CENDFILE_CENDFILE_CENDFILE           12
-#define CWORD_CWORD_CWORD_CWORD                       13
-#define CCTL_CCTL_CCTL_CCTL                           14
+#define CSPCL_CIGN_CIGN_CIGN                     0
+#define CSPCL_CWORD_CWORD_CWORD                  1
+#define CNL_CNL_CNL_CNL                          2
+#define CWORD_CCTL_CCTL_CWORD                    3
+#define CDQUOTE_CENDQUOTE_CWORD_CWORD            4
+#define CVAR_CVAR_CWORD_CVAR                     5
+#define CSQUOTE_CWORD_CENDQUOTE_CWORD            6
+#define CSPCL_CWORD_CWORD_CLP                    7
+#define CSPCL_CWORD_CWORD_CRP                    8
+#define CBACK_CBACK_CCTL_CBACK                   9
+#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE           10
+#define CENDVAR_CENDVAR_CWORD_CENDVAR           11
+#define CENDFILE_CENDFILE_CENDFILE_CENDFILE     12
+#define CWORD_CWORD_CWORD_CWORD                 13
+#define CCTL_CCTL_CCTL_CCTL                     14
 #else
-#define CSPCL_CWORD_CWORD_CWORD                        0
-#define CNL_CNL_CNL_CNL                                1
-#define CWORD_CCTL_CCTL_CWORD                          2
-#define CDQUOTE_CENDQUOTE_CWORD_CWORD                  3
-#define CVAR_CVAR_CWORD_CVAR                           4
-#define CSQUOTE_CWORD_CENDQUOTE_CWORD                  5
-#define CSPCL_CWORD_CWORD_CLP                          6
-#define CSPCL_CWORD_CWORD_CRP                          7
-#define CBACK_CBACK_CCTL_CBACK                         8
-#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE                  9
-#define CENDVAR_CENDVAR_CWORD_CENDVAR                 10
-#define CENDFILE_CENDFILE_CENDFILE_CENDFILE           11
-#define CWORD_CWORD_CWORD_CWORD                       12
-#define CCTL_CCTL_CCTL_CCTL                           13
+#define CSPCL_CWORD_CWORD_CWORD                  0
+#define CNL_CNL_CNL_CNL                          1
+#define CWORD_CCTL_CCTL_CWORD                    2
+#define CDQUOTE_CENDQUOTE_CWORD_CWORD            3
+#define CVAR_CVAR_CWORD_CVAR                     4
+#define CSQUOTE_CWORD_CENDQUOTE_CWORD            5
+#define CSPCL_CWORD_CWORD_CLP                    6
+#define CSPCL_CWORD_CWORD_CRP                    7
+#define CBACK_CBACK_CCTL_CBACK                   8
+#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE            9
+#define CENDVAR_CENDVAR_CWORD_CENDVAR           10
+#define CENDFILE_CENDFILE_CENDFILE_CENDFILE     11
+#define CWORD_CWORD_CWORD_CWORD                 12
+#define CCTL_CCTL_CCTL_CCTL                     13
 #endif
 
 static const char syntax_index_table[258] = {
@@ -2991,300 +2891,212 @@ static const char syntax_index_table[258] = {
        /* 257   127      */ CWORD_CWORD_CWORD_CWORD,
 };
 
+#define SIT(c, syntax) (S_I_T[(int)syntax_index_table[((int)c)+SYNBASE]][syntax])
+
 #endif  /* USE_SIT_FUNCTION */
 
-/*      alias.c      */
 
+/* ============ Alias handling */
+
+#if ENABLE_ASH_ALIAS
+
+#define ALIASINUSE 1
+#define ALIASDEAD  2
 
 #define ATABSIZE 39
 
-static int     funcblocksize;          /* size of structures in function */
-static int     funcstringsize;         /* size of strings in node */
-static void   *funcblock;              /* block to allocate function from */
-static char   *funcstring;             /* block to allocate strings from */
+struct alias {
+       struct alias *next;
+       char *name;
+       char *val;
+       int flag;
+};
 
-static const short nodesize[26] = {
-       SHELL_ALIGN(sizeof(struct ncmd)),
-       SHELL_ALIGN(sizeof(struct npipe)),
-       SHELL_ALIGN(sizeof(struct nredir)),
-       SHELL_ALIGN(sizeof(struct nredir)),
-       SHELL_ALIGN(sizeof(struct nredir)),
-       SHELL_ALIGN(sizeof(struct nbinary)),
-       SHELL_ALIGN(sizeof(struct nbinary)),
-       SHELL_ALIGN(sizeof(struct nbinary)),
-       SHELL_ALIGN(sizeof(struct nif)),
-       SHELL_ALIGN(sizeof(struct nbinary)),
-       SHELL_ALIGN(sizeof(struct nbinary)),
-       SHELL_ALIGN(sizeof(struct nfor)),
-       SHELL_ALIGN(sizeof(struct ncase)),
-       SHELL_ALIGN(sizeof(struct nclist)),
-       SHELL_ALIGN(sizeof(struct narg)),
-       SHELL_ALIGN(sizeof(struct narg)),
-       SHELL_ALIGN(sizeof(struct nfile)),
-       SHELL_ALIGN(sizeof(struct nfile)),
-       SHELL_ALIGN(sizeof(struct nfile)),
-       SHELL_ALIGN(sizeof(struct nfile)),
-       SHELL_ALIGN(sizeof(struct nfile)),
-       SHELL_ALIGN(sizeof(struct ndup)),
-       SHELL_ALIGN(sizeof(struct ndup)),
-       SHELL_ALIGN(sizeof(struct nhere)),
-       SHELL_ALIGN(sizeof(struct nhere)),
-       SHELL_ALIGN(sizeof(struct nnot)),
-};
+static struct alias *atab[ATABSIZE];
 
+static struct alias **
+__lookupalias(const char *name) {
+       unsigned int hashval;
+       struct alias **app;
+       const char *p;
+       unsigned int ch;
 
-static void calcsize(union node *);
-static void sizenodelist(struct nodelist *);
-static union node *copynode(union node *);
-static struct nodelist *copynodelist(struct nodelist *);
-static char *nodeckstrdup(char *);
+       p = name;
 
+       ch = (unsigned char)*p;
+       hashval = ch << 4;
+       while (ch) {
+               hashval += ch;
+               ch = (unsigned char)*++p;
+       }
+       app = &atab[hashval % ATABSIZE];
 
-static int evalskip;                   /* set if we are skipping commands */
-static int skipcount;           /* number of levels to skip */
-static int funcnest;                   /* depth of function calls */
+       for (; *app; app = &(*app)->next) {
+               if (strcmp(name, (*app)->name) == 0) {
+                       break;
+               }
+       }
 
-/* reasons for skipping commands (see comment on breakcmd routine) */
-#define SKIPBREAK      (1 << 0)
-#define SKIPCONT       (1 << 1)
-#define SKIPFUNC       (1 << 2)
-#define SKIPFILE       (1 << 3)
-#define SKIPEVAL       (1 << 4)
+       return app;
+}
 
-/*
- * This file was generated by the mkbuiltins program.
- */
+static struct alias *
+lookupalias(const char *name, int check)
+{
+       struct alias *ap = *__lookupalias(name);
 
-#if JOBS
-static int fg_bgcmd(int, char **);
-#endif
-static int breakcmd(int, char **);
-static int cdcmd(int, char **);
-#if ENABLE_ASH_CMDCMD
-static int commandcmd(int, char **);
-#endif
-static int dotcmd(int, char **);
-static int evalcmd(int, char **);
-#if ENABLE_ASH_BUILTIN_ECHO
-static int echocmd(int, char **);
-#endif
-#if ENABLE_ASH_BUILTIN_TEST
-static int testcmd(int, char **);
-#endif
-static int execcmd(int, char **);
-static int exitcmd(int, char **);
-static int exportcmd(int, char **);
-static int falsecmd(int, char **);
-#if ENABLE_ASH_GETOPTS
-static int getoptscmd(int, char **);
-#endif
-static int hashcmd(int, char **);
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-static int helpcmd(int argc, char **argv);
-#endif
-#if JOBS
-static int jobscmd(int, char **);
-#endif
-#if ENABLE_ASH_MATH_SUPPORT
-static int letcmd(int, char **);
-#endif
-static int localcmd(int, char **);
-static int pwdcmd(int, char **);
-static int readcmd(int, char **);
-static int returncmd(int, char **);
-static int setcmd(int, char **);
-static int shiftcmd(int, char **);
-static int timescmd(int, char **);
-static int trapcmd(int, char **);
-static int truecmd(int, char **);
-static int typecmd(int, char **);
-static int umaskcmd(int, char **);
-static int unsetcmd(int, char **);
-static int waitcmd(int, char **);
-static int ulimitcmd(int, char **);
-#if JOBS
-static int killcmd(int, char **);
-#endif
+       if (check && ap && (ap->flag & ALIASINUSE))
+               return NULL;
+       return ap;
+}
 
-/*      exec.h    */
+static struct alias *
+freealias(struct alias *ap)
+{
+       struct alias *next;
 
-/* values of cmdtype */
-#define CMDUNKNOWN      -1      /* no entry in table for command */
-#define CMDNORMAL       0       /* command is an executable program */
-#define CMDFUNCTION     1       /* command is a shell function */
-#define CMDBUILTIN      2       /* command is a shell builtin */
+       if (ap->flag & ALIASINUSE) {
+               ap->flag |= ALIASDEAD;
+               return ap;
+       }
 
-struct builtincmd {
-       const char *name;
-       int (*builtin)(int, char **);
-       /* unsigned flags; */
-};
+       next = ap->next;
+       free(ap->name);
+       free(ap->val);
+       free(ap);
+       return next;
+}
 
+static void
+setalias(const char *name, const char *val)
+{
+       struct alias *ap, **app;
 
-#define COMMANDCMD (builtincmd + 5 + \
-       2 * ENABLE_ASH_BUILTIN_TEST + \
-       ENABLE_ASH_ALIAS + \
-       ENABLE_ASH_JOB_CONTROL)
-#define EXECCMD (builtincmd + 7 + \
-       2 * ENABLE_ASH_BUILTIN_TEST + \
-       ENABLE_ASH_ALIAS + \
-       ENABLE_ASH_JOB_CONTROL + \
-       ENABLE_ASH_CMDCMD + \
-       ENABLE_ASH_BUILTIN_ECHO)
+       app = __lookupalias(name);
+       ap = *app;
+       INT_OFF;
+       if (ap) {
+               if (!(ap->flag & ALIASINUSE)) {
+                       free(ap->val);
+               }
+               ap->val = ckstrdup(val);
+               ap->flag &= ~ALIASDEAD;
+       } else {
+               /* not found */
+               ap = ckmalloc(sizeof(struct alias));
+               ap->name = ckstrdup(name);
+               ap->val = ckstrdup(val);
+               ap->flag = 0;
+               ap->next = 0;
+               *app = ap;
+       }
+       INT_ON;
+}
 
-#define BUILTIN_NOSPEC  "0"
-#define BUILTIN_SPECIAL "1"
-#define BUILTIN_REGULAR "2"
-#define BUILTIN_SPEC_REG "3"
-#define BUILTIN_ASSIGN  "4"
-#define BUILTIN_SPEC_ASSG  "5"
-#define BUILTIN_REG_ASSG   "6"
-#define BUILTIN_SPEC_REG_ASSG   "7"
+static int
+unalias(const char *name)
+{
+       struct alias **app;
 
-#define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1)
-#define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2)
-#define IS_BUILTIN_ASSIGN(builtincmd) ((builtincmd)->name[0] & 4)
+       app = __lookupalias(name);
 
-/* make sure to keep these in proper order since it is searched via bsearch() */
-static const struct builtincmd builtincmd[] = {
-       { BUILTIN_SPEC_REG      ".", dotcmd },
-       { BUILTIN_SPEC_REG      ":", truecmd },
-#if ENABLE_ASH_BUILTIN_TEST
-       { BUILTIN_REGULAR       "[", testcmd },
-       { BUILTIN_REGULAR       "[[", testcmd },
-#endif
-#if ENABLE_ASH_ALIAS
-       { BUILTIN_REG_ASSG      "alias", aliascmd },
-#endif
-#if JOBS
-       { BUILTIN_REGULAR       "bg", fg_bgcmd },
-#endif
-       { BUILTIN_SPEC_REG      "break", breakcmd },
-       { BUILTIN_REGULAR       "cd", cdcmd },
-       { BUILTIN_NOSPEC        "chdir", cdcmd },
-#if ENABLE_ASH_CMDCMD
-       { BUILTIN_REGULAR       "command", commandcmd },
-#endif
-       { BUILTIN_SPEC_REG      "continue", breakcmd },
-#if ENABLE_ASH_BUILTIN_ECHO
-       { BUILTIN_REGULAR       "echo", echocmd },
-#endif
-       { BUILTIN_SPEC_REG      "eval", evalcmd },
-       { BUILTIN_SPEC_REG      "exec", execcmd },
-       { BUILTIN_SPEC_REG      "exit", exitcmd },
-       { BUILTIN_SPEC_REG_ASSG "export", exportcmd },
-       { BUILTIN_REGULAR       "false", falsecmd },
-#if JOBS
-       { BUILTIN_REGULAR       "fg", fg_bgcmd },
-#endif
-#if ENABLE_ASH_GETOPTS
-       { BUILTIN_REGULAR       "getopts", getoptscmd },
-#endif
-       { BUILTIN_NOSPEC        "hash", hashcmd },
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-       { BUILTIN_NOSPEC        "help", helpcmd },
-#endif
-#if JOBS
-       { BUILTIN_REGULAR       "jobs", jobscmd },
-       { BUILTIN_REGULAR       "kill", killcmd },
-#endif
-#if ENABLE_ASH_MATH_SUPPORT
-       { BUILTIN_NOSPEC        "let", letcmd },
-#endif
-       { BUILTIN_ASSIGN        "local", localcmd },
-       { BUILTIN_NOSPEC        "pwd", pwdcmd },
-       { BUILTIN_REGULAR       "read", readcmd },
-       { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd },
-       { BUILTIN_SPEC_REG      "return", returncmd },
-       { BUILTIN_SPEC_REG      "set", setcmd },
-       { BUILTIN_SPEC_REG      "shift", shiftcmd },
-       { BUILTIN_SPEC_REG      "source", dotcmd },
-#if ENABLE_ASH_BUILTIN_TEST
-       { BUILTIN_REGULAR       "test", testcmd },
-#endif
-       { BUILTIN_SPEC_REG      "times", timescmd },
-       { BUILTIN_SPEC_REG      "trap", trapcmd },
-       { BUILTIN_REGULAR       "true", truecmd },
-       { BUILTIN_NOSPEC        "type", typecmd },
-       { BUILTIN_NOSPEC        "ulimit", ulimitcmd },
-       { BUILTIN_REGULAR       "umask", umaskcmd },
-#if ENABLE_ASH_ALIAS
-       { BUILTIN_REGULAR       "unalias", unaliascmd },
-#endif
-       { BUILTIN_SPEC_REG      "unset", unsetcmd },
-       { BUILTIN_REGULAR       "wait", waitcmd },
-};
+       if (*app) {
+               INT_OFF;
+               *app = freealias(*app);
+               INT_ON;
+               return 0;
+       }
 
-#define NUMBUILTINS (sizeof(builtincmd) / sizeof(builtincmd[0]))
+       return 1;
+}
 
+static void
+rmaliases(void)
+{
+       struct alias *ap, **app;
+       int i;
 
-struct cmdentry {
-       int cmdtype;
-       union param {
-               int index;
-               const struct builtincmd *cmd;
-               struct funcnode *func;
-       } u;
-};
+       INT_OFF;
+       for (i = 0; i < ATABSIZE; i++) {
+               app = &atab[i];
+               for (ap = *app; ap; ap = *app) {
+                       *app = freealias(*app);
+                       if (ap == *app) {
+                               app = &ap->next;
+                       }
+               }
+       }
+       INT_ON;
+}
 
+static void
+printalias(const struct alias *ap)
+{
+       out1fmt("%s=%s\n", ap->name, single_quote(ap->val));
+}
 
-/* action to find_command() */
-#define DO_ERR          0x01    /* prints errors */
-#define DO_ABS          0x02    /* checks absolute paths */
-#define DO_NOFUNC       0x04    /* don't return shell functions, for command */
-#define DO_ALTPATH      0x08    /* using alternate path */
-#define DO_ALTBLTIN     0x20    /* %builtin in alt. path */
+/*
+ * TODO - sort output
+ */
+static int
+aliascmd(int argc, char **argv)
+{
+       char *n, *v;
+       int ret = 0;
+       struct alias *ap;
 
-static void shellexec(char **, const char *, int) ATTRIBUTE_NORETURN;
-static char *padvance(const char **, const char *);
-static void find_command(char *, struct cmdentry *, int, const char *);
-static struct builtincmd *find_builtin(const char *);
-static void defun(char *, union node *);
-static void unsetfunc(const char *);
+       if (argc == 1) {
+               int i;
 
-#if ENABLE_ASH_MATH_SUPPORT_64
-typedef int64_t arith_t;
-#define arith_t_type (long long)
-#else
-typedef long arith_t;
-#define arith_t_type (long)
-#endif
+               for (i = 0; i < ATABSIZE; i++)
+                       for (ap = atab[i]; ap; ap = ap->next) {
+                               printalias(ap);
+                       }
+               return 0;
+       }
+       while ((n = *++argv) != NULL) {
+               v = strchr(n+1, '=');
+               if (v == NULL) { /* n+1: funny ksh stuff */
+                       ap = *__lookupalias(n);
+                       if (ap == NULL) {
+                               fprintf(stderr, "%s: %s not found\n", "alias", n);
+                               ret = 1;
+                       } else
+                               printalias(ap);
+               } else {
+                       *v++ = '\0';
+                       setalias(n, v);
+               }
+       }
 
-#if ENABLE_ASH_MATH_SUPPORT
-static arith_t dash_arith(const char *);
-static arith_t arith(const char *expr, int *perrcode);
-#endif
+       return ret;
+}
 
-#if ENABLE_ASH_RANDOM_SUPPORT
-static unsigned long rseed;
-# ifndef DYNAMIC_VAR
-#  define DYNAMIC_VAR
-# endif
-#endif
+static int
+unaliascmd(int argc, char **argv)
+{
+       int i;
 
-/* PEOF (the end of file marker) */
+       while ((i = nextopt("a")) != '\0') {
+               if (i == 'a') {
+                       rmaliases();
+                       return 0;
+               }
+       }
+       for (i = 0; *argptr; argptr++) {
+               if (unalias(*argptr)) {
+                       fprintf(stderr, "%s: %s not found\n", "unalias", *argptr);
+                       i = 1;
+               }
+       }
 
-enum {
-       INPUT_PUSH_FILE = 1,
-       INPUT_NOFILE_OK = 2,
-};
+       return i;
+}
 
-/*
- * The input line number.  Input.c just defines this variable, and saves
- * and restores it when files are pushed and popped.  The user of this
- * package must set its value.
- */
-static void pungetc(void);
-static void pushstring(char *, void *);
-static void popstring(void);
-static void setinputfd(int, int);
-static void setinputstring(char *);
-static void popfile(void);
-static void popallfiles(void);
-static void closescript(void);
+#endif /* ASH_ALIAS */
 
-/*      jobs.h    */
 
+/* ============ jobs.c */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
 #define FORK_FG 0
@@ -3296,7 +3108,6 @@ static void closescript(void);
 #define SHOW_PID        0x04    /* include process pid */
 #define SHOW_CHANGED    0x08    /* only jobs whose state has changed */
 
-
 /*
  * A job structure contains information about a job.  A job is either a
  * single process or a set of processes contained in a pipeline.  In the
@@ -3333,2073 +3144,1934 @@ struct job {
 };
 
 static pid_t backgndpid;        /* pid of last background process */
-static int job_warning;         /* user was warned about stopped jobs */
-#if JOBS
-static int jobctl;              /* true if doing job control */
-#endif
+static smallint job_warning;    /* user was warned about stopped jobs (can be 2, 1 or 0). */
 
 static struct job *makejob(union node *, int);
 static int forkshell(struct job *, union node *, int);
 static int waitforjob(struct job *);
-static int stoppedjobs(void);
 
-#if ! JOBS
-#define setjobctl(on)   /* do nothing */
+#if !JOBS
+enum { jobctl = 0 };
+#define setjobctl(on) do {} while (0)
 #else
+static smallint jobctl;              /* true if doing job control */
 static void setjobctl(int);
-static void showjobs(FILE *, int);
 #endif
 
+/*
+ * Set the signal handler for the specified signal.  The routine figures
+ * out what it should be set to.
+ */
+static void
+setsignal(int signo)
+{
+       int action;
+       char *t, tsig;
+       struct sigaction act;
 
-/*      main.h        */
-
-static void readcmdfile(char *);
-
-/*      options.h */
-
-static char *minusc;                   /* argument to -c option */
-
-
-static void optschanged(void);
-static void setparam(char **);
-static void freeparam(volatile struct shparam *);
-static int shiftcmd(int, char **);
-static int setcmd(int, char **);
-static int nextopt(const char *);
-
-/*      redir.h      */
-
-/* flags passed to redirect */
-#define REDIR_PUSH 01           /* save previous values of file descriptors */
-#define REDIR_SAVEFD2 03       /* set preverrout */
-
-static void redirect(union node *, int);
-static void popredir(int);
-static void clearredir(int);
-static int copyfd(int, int);
-static int redirectsafe(union node *, int);
-
-/*      trap.h       */
-
-static void clear_traps(void);
-static void setsignal(int);
-static void ignoresig(int);
-static void onsig(int);
-static int dotrap(void);
-static void setinteractive(int);
-static void exitshell(void) ATTRIBUTE_NORETURN;
-
-
-static int is_safe_applet(char *name)
-{
-       /* It isn't a bug to have non-existent applet here... */
-       /* ...just a waste of space... */
-       static const char safe_applets[][8] = {
-               "["
-               USE_AWK    (, "awk"    )
-               USE_CAT    (, "cat"    )
-               USE_CHMOD  (, "chmod"  )
-               USE_CHOWN  (, "chown"  )
-               USE_CP     (, "cp"     )
-               USE_CUT    (, "cut"    )
-               USE_DD     (, "dd"     )
-               USE_ECHO   (, "echo"   )
-               USE_FIND   (, "find"   )
-               USE_HEXDUMP(, "hexdump")
-               USE_LN     (, "ln"     )
-               USE_LS     (, "ls"     )
-               USE_MKDIR  (, "mkdir"  )
-               USE_RM     (, "rm"     )
-               USE_SORT   (, "sort"   )
-               USE_TEST   (, "test"   )
-               USE_TOUCH  (, "touch"  )
-               USE_XARGS  (, "xargs"  )
-       };
-       int n = sizeof(safe_applets) / sizeof(safe_applets[0]);
-       int i;
-       for (i = 0; i < n; i++)
-               if (strcmp(safe_applets[i], name) == 0)
-                       return 1;
-
-       return 0;
-}
-
-
-#if ENABLE_ASH_ALIAS
-struct alias {
-       struct alias *next;
-       char *name;
-       char *val;
-       int flag;
-};
-
-static struct alias *atab[ATABSIZE];
-
-static struct alias **
-__lookupalias(const char *name) {
-       unsigned int hashval;
-       struct alias **app;
-       const char *p;
-       unsigned int ch;
-
-       p = name;
-
-       ch = (unsigned char)*p;
-       hashval = ch << 4;
-       while (ch) {
-               hashval += ch;
-               ch = (unsigned char)*++p;
-       }
-       app = &atab[hashval % ATABSIZE];
-
-       for (; *app; app = &(*app)->next) {
-               if (strcmp(name, (*app)->name) == 0) {
+       t = trap[signo];
+       if (t == NULL)
+               action = S_DFL;
+       else if (*t != '\0')
+               action = S_CATCH;
+       else
+               action = S_IGN;
+       if (rootshell && action == S_DFL) {
+               switch (signo) {
+               case SIGINT:
+                       if (iflag || minusc || sflag == 0)
+                               action = S_CATCH;
+                       break;
+               case SIGQUIT:
+#if DEBUG
+                       if (debug)
+                               break;
+#endif
+                       /* FALLTHROUGH */
+               case SIGTERM:
+                       if (iflag)
+                               action = S_IGN;
                        break;
+#if JOBS
+               case SIGTSTP:
+               case SIGTTOU:
+                       if (mflag)
+                               action = S_IGN;
+                       break;
+#endif
                }
        }
 
-       return app;
-}
-
-static struct alias *
-lookupalias(const char *name, int check)
-{
-       struct alias *ap = *__lookupalias(name);
-
-       if (check && ap && (ap->flag & ALIASINUSE))
-               return NULL;
-       return ap;
+       t = &sigmode[signo - 1];
+       tsig = *t;
+       if (tsig == 0) {
+               /*
+                * current setting unknown
+                */
+               if (sigaction(signo, 0, &act) == -1) {
+                       /*
+                        * Pretend it worked; maybe we should give a warning
+                        * here, but other shells don't. We don't alter
+                        * sigmode, so that we retry every time.
+                        */
+                       return;
+               }
+               if (act.sa_handler == SIG_IGN) {
+                       if (mflag
+                        && (signo == SIGTSTP || signo == SIGTTIN || signo == SIGTTOU)
+                       ) {
+                               tsig = S_IGN;   /* don't hard ignore these */
+                       } else
+                               tsig = S_HARD_IGN;
+               } else {
+                       tsig = S_RESET; /* force to be set */
+               }
+       }
+       if (tsig == S_HARD_IGN || tsig == action)
+               return;
+       switch (action) {
+       case S_CATCH:
+               act.sa_handler = onsig;
+               break;
+       case S_IGN:
+               act.sa_handler = SIG_IGN;
+               break;
+       default:
+               act.sa_handler = SIG_DFL;
+       }
+       *t = action;
+       act.sa_flags = 0;
+       sigfillset(&act.sa_mask);
+       sigaction(signo, &act, 0);
 }
 
-static struct alias *
-freealias(struct alias *ap)
-{
-       struct alias *next;
+/* mode flags for set_curjob */
+#define CUR_DELETE 2
+#define CUR_RUNNING 1
+#define CUR_STOPPED 0
 
-       if (ap->flag & ALIASINUSE) {
-               ap->flag |= ALIASDEAD;
-               return ap;
-       }
+/* mode flags for dowait */
+#define DOWAIT_NORMAL 0
+#define DOWAIT_BLOCK 1
 
-       next = ap->next;
-       free(ap->name);
-       free(ap->val);
-       free(ap);
-       return next;
-}
+#if JOBS
+/* pgrp of shell on invocation */
+static int initialpgrp;
+static int ttyfd = -1;
+#endif
+/* array of jobs */
+static struct job *jobtab;
+/* size of array */
+static unsigned njobs;
+/* current job */
+static struct job *curjob;
+/* number of presumed living untracked jobs */
+static int jobless;
 
 static void
-setalias(const char *name, const char *val)
+set_curjob(struct job *jp, unsigned mode)
 {
-       struct alias *ap, **app;
+       struct job *jp1;
+       struct job **jpp, **curp;
 
-       app = __lookupalias(name);
-       ap = *app;
-       INT_OFF;
-       if (ap) {
-               if (!(ap->flag & ALIASINUSE)) {
-                       free(ap->val);
-               }
-               ap->val = ckstrdup(val);
-               ap->flag &= ~ALIASDEAD;
-       } else {
-               /* not found */
-               ap = ckmalloc(sizeof(struct alias));
-               ap->name = ckstrdup(name);
-               ap->val = ckstrdup(val);
-               ap->flag = 0;
-               ap->next = 0;
-               *app = ap;
+       /* first remove from list */
+       jpp = curp = &curjob;
+       do {
+               jp1 = *jpp;
+               if (jp1 == jp)
+                       break;
+               jpp = &jp1->prev_job;
+       } while (1);
+       *jpp = jp1->prev_job;
+
+       /* Then re-insert in correct position */
+       jpp = curp;
+       switch (mode) {
+       default:
+#if DEBUG
+               abort();
+#endif
+       case CUR_DELETE:
+               /* job being deleted */
+               break;
+       case CUR_RUNNING:
+               /* newly created job or backgrounded job,
+                  put after all stopped jobs. */
+               do {
+                       jp1 = *jpp;
+#if JOBS
+                       if (!jp1 || jp1->state != JOBSTOPPED)
+#endif
+                               break;
+                       jpp = &jp1->prev_job;
+               } while (1);
+               /* FALLTHROUGH */
+#if JOBS
+       case CUR_STOPPED:
+#endif
+               /* newly stopped job - becomes curjob */
+               jp->prev_job = *jpp;
+               *jpp = jp;
+               break;
        }
-       INT_ON;
 }
 
+#if JOBS || DEBUG
 static int
-unalias(const char *name)
+jobno(const struct job *jp)
 {
-       struct alias **app;
+       return jp - jobtab + 1;
+}
+#endif
 
-       app = __lookupalias(name);
+/*
+ * Convert a job name to a job structure.
+ */
+static struct job *
+getjob(const char *name, int getctl)
+{
+       struct job *jp;
+       struct job *found;
+       const char *err_msg = "No such job: %s";
+       unsigned num;
+       int c;
+       const char *p;
+       char *(*match)(const char *, const char *);
 
-       if (*app) {
-               INT_OFF;
-               *app = freealias(*app);
-               INT_ON;
-               return 0;
-       }
+       jp = curjob;
+       p = name;
+       if (!p)
+               goto currentjob;
 
-       return 1;
-}
+       if (*p != '%')
+               goto err;
 
-static void
-rmaliases(void)
-{
-       struct alias *ap, **app;
-       int i;
+       c = *++p;
+       if (!c)
+               goto currentjob;
 
-       INT_OFF;
-       for (i = 0; i < ATABSIZE; i++) {
-               app = &atab[i];
-               for (ap = *app; ap; ap = *app) {
-                       *app = freealias(*app);
-                       if (ap == *app) {
-                               app = &ap->next;
-                       }
+       if (!p[1]) {
+               if (c == '+' || c == '%') {
+ currentjob:
+                       err_msg = "No current job";
+                       goto check;
+               }
+               if (c == '-') {
+                       if (jp)
+                               jp = jp->prev_job;
+                       err_msg = "No previous job";
+ check:
+                       if (!jp)
+                               goto err;
+                       goto gotit;
                }
        }
-       INT_ON;
-}
-
-/*
- * TODO - sort output
- */
-static int
-aliascmd(int argc, char **argv)
-{
-       char *n, *v;
-       int ret = 0;
-       struct alias *ap;
 
-       if (argc == 1) {
-               int i;
+       if (is_number(p)) {
+               num = atoi(p);
+               if (num < njobs) {
+                       jp = jobtab + num - 1;
+                       if (jp->used)
+                               goto gotit;
+                       goto err;
+               }
+       }
 
-               for (i = 0; i < ATABSIZE; i++)
-                       for (ap = atab[i]; ap; ap = ap->next) {
-                               printalias(ap);
-                       }
-               return 0;
+       match = prefix;
+       if (*p == '?') {
+               match = strstr;
+               p++;
        }
-       while ((n = *++argv) != NULL) {
-               v = strchr(n+1, '=');
-               if (v == NULL) { /* n+1: funny ksh stuff */
-                       ap = *__lookupalias(n);
-                       if (ap == NULL) {
-                               fprintf(stderr, "%s: %s not found\n", "alias", n);
-                               ret = 1;
-                       } else
-                               printalias(ap);
-               } else {
-                       *v++ = '\0';
-                       setalias(n, v);
+
+       found = 0;
+       while (1) {
+               if (!jp)
+                       goto err;
+               if (match(jp->ps[0].cmd, p)) {
+                       if (found)
+                               goto err;
+                       found = jp;
+                       err_msg = "%s: ambiguous";
                }
+               jp = jp->prev_job;
        }
 
-       return ret;
+ gotit:
+#if JOBS
+       err_msg = "job %s not created under job control";
+       if (getctl && jp->jobctl == 0)
+               goto err;
+#endif
+       return jp;
+ err:
+       ash_msg_and_raise_error(err_msg, name);
 }
 
-static int
-unaliascmd(int argc, char **argv)
+/*
+ * Mark a job structure as unused.
+ */
+static void
+freejob(struct job *jp)
 {
+       struct procstat *ps;
        int i;
 
-       while ((i = nextopt("a")) != '\0') {
-               if (i == 'a') {
-                       rmaliases();
-                       return 0;
-               }
-       }
-       for (i = 0; *argptr; argptr++) {
-               if (unalias(*argptr)) {
-                       fprintf(stderr, "%s: %s not found\n", "unalias", *argptr);
-                       i = 1;
-               }
+       INT_OFF;
+       for (i = jp->nprocs, ps = jp->ps; --i >= 0; ps++) {
+               if (ps->cmd != nullstr)
+                       free(ps->cmd);
        }
-
-       return i;
+       if (jp->ps != &jp->ps0)
+               free(jp->ps);
+       jp->used = 0;
+       set_curjob(jp, CUR_DELETE);
+       INT_ON;
 }
 
+#if JOBS
 static void
-printalias(const struct alias *ap)
+xtcsetpgrp(int fd, pid_t pgrp)
 {
-       out1fmt("%s=%s\n", ap->name, single_quote(ap->val));
+       if (tcsetpgrp(fd, pgrp))
+               ash_msg_and_raise_error("cannot set tty process group (%m)");
 }
-#endif /* ASH_ALIAS */
-
-/*      eval.c  */
 
 /*
- * Evaluate a command.
+ * Turn job control on and off.
+ *
+ * Note:  This code assumes that the third arg to ioctl is a character
+ * pointer, which is true on Berkeley systems but not System V.  Since
+ * System V doesn't have job control yet, this isn't a problem now.
+ *
+ * Called with interrupts off.
  */
+static void
+setjobctl(int on)
+{
+       int fd;
+       int pgrp;
 
-/* flags in argument to evaltree */
-#define EV_EXIT 01              /* exit after evaluating tree */
-#define EV_TESTED 02            /* exit status is checked; ignore -e flag */
-#define EV_BACKCMD 04           /* command executing within back quotes */
-
-
-static void evalloop(union node *, int);
-static void evalfor(union node *, int);
-static void evalcase(union node *, int);
-static void evalsubshell(union node *, int);
-static void expredir(union node *);
-static void evalpipe(union node *, int);
-static void evalcommand(union node *, int);
-static int evalbltin(const struct builtincmd *, int, char **);
-static int evalfun(struct funcnode *, int, char **, int);
-static void prehash(union node *);
-static int bltincmd(int, char **);
-
-
-static const struct builtincmd bltin = {
-       "\0\0", bltincmd
-};
-
-
-
-/*
- * Evaluate a parse tree.  The value is left in the global variable
- * exitstatus.
- */
-static void
-evaltree(union node *n, int flags)
-{
-       int checkexit = 0;
-       void (*evalfn)(union node *, int);
-       unsigned isor;
-       int status;
-       if (n == NULL) {
-               TRACE(("evaltree(NULL) called\n"));
-               goto out;
-       }
-       TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
-                       getpid(), n, n->type, flags));
-       switch (n->type) {
-       default:
-#if DEBUG
-               out1fmt("Node type = %d\n", n->type);
-               fflush(stdout);
-               break;
-#endif
-       case NNOT:
-               evaltree(n->nnot.com, EV_TESTED);
-               status = !exitstatus;
-               goto setstatus;
-       case NREDIR:
-               expredir(n->nredir.redirect);
-               status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
-               if (!status) {
-                       evaltree(n->nredir.n, flags & EV_TESTED);
-                       status = exitstatus;
-               }
-               popredir(0);
-               goto setstatus;
-       case NCMD:
-               evalfn = evalcommand;
- checkexit:
-               if (eflag && !(flags & EV_TESTED))
-                       checkexit = ~0;
-               goto calleval;
-       case NFOR:
-               evalfn = evalfor;
-               goto calleval;
-       case NWHILE:
-       case NUNTIL:
-               evalfn = evalloop;
-               goto calleval;
-       case NSUBSHELL:
-       case NBACKGND:
-               evalfn = evalsubshell;
-               goto calleval;
-       case NPIPE:
-               evalfn = evalpipe;
-               goto checkexit;
-       case NCASE:
-               evalfn = evalcase;
-               goto calleval;
-       case NAND:
-       case NOR:
-       case NSEMI:
-#if NAND + 1 != NOR
-#error NAND + 1 != NOR
-#endif
-#if NOR + 1 != NSEMI
-#error NOR + 1 != NSEMI
-#endif
-               isor = n->type - NAND;
-               evaltree(
-                       n->nbinary.ch1,
-                       (flags | ((isor >> 1) - 1)) & EV_TESTED
-               );
-               if (!exitstatus == isor)
-                       break;
-               if (!evalskip) {
-                       n = n->nbinary.ch2;
- evaln:
-                       evalfn = evaltree;
- calleval:
-                       evalfn(n, flags);
-                       break;
-               }
-               break;
-       case NIF:
-               evaltree(n->nif.test, EV_TESTED);
-               if (evalskip)
-                       break;
-               if (exitstatus == 0) {
-                       n = n->nif.ifpart;
-                       goto evaln;
-               } else if (n->nif.elsepart) {
-                       n = n->nif.elsepart;
-                       goto evaln;
+       if (on == jobctl || rootshell == 0)
+               return;
+       if (on) {
+               int ofd;
+               ofd = fd = open(_PATH_TTY, O_RDWR);
+               if (fd < 0) {
+       /* BTW, bash will try to open(ttyname(0)) if open("/dev/tty") fails.
+        * That sometimes helps to acquire controlling tty.
+        * Obviously, a workaround for bugs when someone
+        * failed to provide a controlling tty to bash! :) */
+                       fd += 3;
+                       while (!isatty(fd) && --fd >= 0)
+                               ;
                }
-               goto success;
-       case NDEFUN:
-               defun(n->narg.text, n->narg.next);
- success:
-               status = 0;
- setstatus:
-               exitstatus = status;
-               break;
-       }
+               fd = fcntl(fd, F_DUPFD, 10);
+               close(ofd);
+               if (fd < 0)
+                       goto out;
+               close_on_exec_on(fd);
+               do { /* while we are in the background */
+                       pgrp = tcgetpgrp(fd);
+                       if (pgrp < 0) {
  out:
-       if ((checkexit & exitstatus))
-               evalskip |= SKIPEVAL;
-       else if (pendingsigs && dotrap())
-               goto exexit;
+                               ash_msg("can't access tty; job control turned off");
+                               mflag = on = 0;
+                               goto close;
+                       }
+                       if (pgrp == getpgrp())
+                               break;
+                       killpg(0, SIGTTIN);
+               } while (1);
+               initialpgrp = pgrp;
 
-       if (flags & EV_EXIT) {
- exexit:
-               raise_exception(EXEXIT);
+               setsignal(SIGTSTP);
+               setsignal(SIGTTOU);
+               setsignal(SIGTTIN);
+               pgrp = rootpid;
+               setpgid(0, pgrp);
+               xtcsetpgrp(fd, pgrp);
+       } else {
+               /* turning job control off */
+               fd = ttyfd;
+               pgrp = initialpgrp;
+               /* was xtcsetpgrp, but this can make exiting ash
+                * with pty already deleted loop forever */
+               tcsetpgrp(fd, pgrp);
+               setpgid(0, pgrp);
+               setsignal(SIGTSTP);
+               setsignal(SIGTTOU);
+               setsignal(SIGTTIN);
+ close:
+               close(fd);
+               fd = -1;
        }
+       ttyfd = fd;
+       jobctl = on;
 }
 
-
-#if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
-static
-#endif
-void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
-
-
-static void
-evalloop(union node *n, int flags)
+static int
+killcmd(int argc, char **argv)
 {
-       int status;
-
-       loopnest++;
-       status = 0;
-       flags &= EV_TESTED;
-       for (;;) {
-               int i;
-
-               evaltree(n->nbinary.ch1, EV_TESTED);
-               if (evalskip) {
- skipping:
-                       if (evalskip == SKIPCONT && --skipcount <= 0) {
-                               evalskip = 0;
-                               continue;
+       if (argv[1] && strcmp(argv[1], "-l") != 0) {
+               int i = 1;
+               do {
+                       if (argv[i][0] == '%') {
+                               struct job *jp = getjob(argv[i], 0);
+                               unsigned pid = jp->ps[0].pid;
+                               /* Enough space for ' -NNN<nul>' */
+                               argv[i] = alloca(sizeof(int)*3 + 3);
+                               /* kill_main has matching code to expect
+                                * leading space. Needed to not confuse
+                                * negative pids with "kill -SIGNAL_NO" syntax */
+                               sprintf(argv[i], " -%u", pid);
                        }
-                       if (evalskip == SKIPBREAK && --skipcount <= 0)
-                               evalskip = 0;
-                       break;
-               }
-               i = exitstatus;
-               if (n->type != NWHILE)
-                       i = !i;
-               if (i != 0)
-                       break;
-               evaltree(n->nbinary.ch2, flags);
-               status = exitstatus;
-               if (evalskip)
-                       goto skipping;
+               } while (argv[++i]);
        }
-       loopnest--;
-       exitstatus = status;
+       return kill_main(argc, argv);
 }
 
-
 static void
-evalfor(union node *n, int flags)
+showpipe(struct job *jp, FILE *out)
 {
-       struct arglist arglist;
-       union node *argp;
-       struct strlist *sp;
-       struct stackmark smark;
-
-       setstackmark(&smark);
-       arglist.lastp = &arglist.list;
-       for (argp = n->nfor.args; argp; argp = argp->narg.next) {
-               expandarg(argp, &arglist, EXP_FULL | EXP_TILDE | EXP_RECORD);
-               /* XXX */
-               if (evalskip)
-                       goto out;
-       }
-       *arglist.lastp = NULL;
+       struct procstat *sp;
+       struct procstat *spend;
 
-       exitstatus = 0;
-       loopnest++;
-       flags &= EV_TESTED;
-       for (sp = arglist.list; sp; sp = sp->next) {
-               setvar(n->nfor.var, sp->text, 0);
-               evaltree(n->nfor.body, flags);
-               if (evalskip) {
-                       if (evalskip == SKIPCONT && --skipcount <= 0) {
-                               evalskip = 0;
-                               continue;
-                       }
-                       if (evalskip == SKIPBREAK && --skipcount <= 0)
-                               evalskip = 0;
-                       break;
-               }
-       }
-       loopnest--;
- out:
-       popstackmark(&smark);
+       spend = jp->ps + jp->nprocs;
+       for (sp = jp->ps + 1; sp < spend; sp++)
+               fprintf(out, " | %s", sp->cmd);
+       outcslow('\n', out);
+       flush_stdout_stderr();
 }
 
 
-static void
-evalcase(union node *n, int flags)
+static int
+restartjob(struct job *jp, int mode)
 {
-       union node *cp;
-       union node *patp;
-       struct arglist arglist;
-       struct stackmark smark;
-
-       setstackmark(&smark);
-       arglist.lastp = &arglist.list;
-       expandarg(n->ncase.expr, &arglist, EXP_TILDE);
-       exitstatus = 0;
-       for (cp = n->ncase.cases; cp && evalskip == 0; cp = cp->nclist.next) {
-               for (patp = cp->nclist.pattern; patp; patp = patp->narg.next) {
-                       if (casematch(patp, arglist.list->text)) {
-                               if (evalskip == 0) {
-                                       evaltree(cp->nclist.body, flags);
-                               }
-                               goto out;
-                       }
+       struct procstat *ps;
+       int i;
+       int status;
+       pid_t pgid;
+
+       INT_OFF;
+       if (jp->state == JOBDONE)
+               goto out;
+       jp->state = JOBRUNNING;
+       pgid = jp->ps->pid;
+       if (mode == FORK_FG)
+               xtcsetpgrp(ttyfd, pgid);
+       killpg(pgid, SIGCONT);
+       ps = jp->ps;
+       i = jp->nprocs;
+       do {
+               if (WIFSTOPPED(ps->status)) {
+                       ps->status = -1;
                }
-       }
+               ps++;
+       } while (--i);
  out:
-       popstackmark(&smark);
+       status = (mode == FORK_FG) ? waitforjob(jp) : 0;
+       INT_ON;
+       return status;
 }
 
-
-/*
- * Kick off a subshell to evaluate a tree.
- */
-static void
-evalsubshell(union node *n, int flags)
+static int
+fg_bgcmd(int argc, char **argv)
 {
        struct job *jp;
-       int backgnd = (n->type == NBACKGND);
-       int status;
+       FILE *out;
+       int mode;
+       int retval;
 
-       expredir(n->nredir.redirect);
-       if (!backgnd && flags & EV_EXIT && !trap[0])
-               goto nofork;
-       INT_OFF;
-       jp = makejob(n, 1);
-       if (forkshell(jp, n, backgnd) == 0) {
-               INT_ON;
-               flags |= EV_EXIT;
-               if (backgnd)
-                       flags &=~ EV_TESTED;
- nofork:
-               redirect(n->nredir.redirect, 0);
-               evaltreenr(n->nredir.n, flags);
-               /* never returns */
-       }
-       status = 0;
-       if (! backgnd)
-               status = waitforjob(jp);
-       exitstatus = status;
-       INT_ON;
+       mode = (**argv == 'f') ? FORK_FG : FORK_BG;
+       nextopt(nullstr);
+       argv = argptr;
+       out = stdout;
+       do {
+               jp = getjob(*argv, 1);
+               if (mode == FORK_BG) {
+                       set_curjob(jp, CUR_RUNNING);
+                       fprintf(out, "[%d] ", jobno(jp));
+               }
+               outstr(jp->ps->cmd, out);
+               showpipe(jp, out);
+               retval = restartjob(jp, mode);
+       } while (*argv && *++argv);
+       return retval;
 }
+#endif
 
-
-/*
- * Compute the names of the files in a redirection list.
- */
-static void
-expredir(union node *n)
+static int
+sprint_status(char *s, int status, int sigonly)
 {
-       union node *redir;
-
-       for (redir = n; redir; redir = redir->nfile.next) {
-               struct arglist fn;
+       int col;
+       int st;
 
-               memset(&fn, 0, sizeof(fn));
-               fn.lastp = &fn.list;
-               switch (redir->type) {
-               case NFROMTO:
-               case NFROM:
-               case NTO:
-               case NCLOBBER:
-               case NAPPEND:
-                       expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
-                       redir->nfile.expfname = fn.list->text;
-                       break;
-               case NFROMFD:
-               case NTOFD:
-                       if (redir->ndup.vname) {
-                               expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
-                               if (fn.list == NULL)
-                                       ash_msg_and_raise_error("redir error");
-                               fixredir(redir, fn.list->text, 1);
-                       }
-                       break;
+       col = 0;
+       if (!WIFEXITED(status)) {
+#if JOBS
+               if (WIFSTOPPED(status))
+                       st = WSTOPSIG(status);
+               else
+#endif
+                       st = WTERMSIG(status);
+               if (sigonly) {
+                       if (st == SIGINT || st == SIGPIPE)
+                               goto out;
+#if JOBS
+                       if (WIFSTOPPED(status))
+                               goto out;
+#endif
+               }
+               st &= 0x7f;
+               col = fmtstr(s, 32, strsignal(st));
+               if (WCOREDUMP(status)) {
+                       col += fmtstr(s + col, 16, " (core dumped)");
                }
+       } else if (!sigonly) {
+               st = WEXITSTATUS(status);
+               if (st)
+                       col = fmtstr(s, 16, "Done(%d)", st);
+               else
+                       col = fmtstr(s, 16, "Done");
        }
+ out:
+       return col;
 }
 
-
 /*
- * Evaluate a pipeline.  All the processes in the pipeline are children
- * of the process creating the pipeline.  (This differs from some versions
- * of the shell, which make the last process in a pipeline the parent
- * of all the rest.)
+ * Do a wait system call.  If job control is compiled in, we accept
+ * stopped processes.  If block is zero, we return a value of zero
+ * rather than blocking.
+ *
+ * System V doesn't have a non-blocking wait system call.  It does
+ * have a SIGCLD signal that is sent to a process when one of it's
+ * children dies.  The obvious way to use SIGCLD would be to install
+ * a handler for SIGCLD which simply bumped a counter when a SIGCLD
+ * was received, and have waitproc bump another counter when it got
+ * the status of a process.  Waitproc would then know that a wait
+ * system call would not block if the two counters were different.
+ * This approach doesn't work because if a process has children that
+ * have not been waited for, System V will send it a SIGCLD when it
+ * installs a signal handler for SIGCLD.  What this means is that when
+ * a child exits, the shell will be sent SIGCLD signals continuously
+ * until is runs out of stack space, unless it does a wait call before
+ * restoring the signal handler.  The code below takes advantage of
+ * this (mis)feature by installing a signal handler for SIGCLD and
+ * then checking to see whether it was called.  If there are any
+ * children to be waited for, it will be.
+ *
+ * If neither SYSV nor BSD is defined, we don't implement nonblocking
+ * waits at all.  In this case, the user will not be informed when
+ * a background process until the next time she runs a real program
+ * (as opposed to running a builtin command or just typing return),
+ * and the jobs command may give out of date information.
  */
-static void
-evalpipe(union node *n, int flags)
+static int
+waitproc(int block, int *status)
 {
-       struct job *jp;
-       struct nodelist *lp;
-       int pipelen;
-       int prevfd;
-       int pip[2];
+       int flags = 0;
 
-       TRACE(("evalpipe(0x%lx) called\n", (long)n));
-       pipelen = 0;
-       for (lp = n->npipe.cmdlist; lp; lp = lp->next)
-               pipelen++;
-       flags |= EV_EXIT;
-       INT_OFF;
-       jp = makejob(n, pipelen);
-       prevfd = -1;
-       for (lp = n->npipe.cmdlist; lp; lp = lp->next) {
-               prehash(lp->n);
-               pip[1] = -1;
-               if (lp->next) {
-                       if (pipe(pip) < 0) {
-                               close(prevfd);
-                               ash_msg_and_raise_error("Pipe call failed");
-                       }
-               }
-               if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) {
-                       INT_ON;
-                       if (pip[1] >= 0) {
-                               close(pip[0]);
-                       }
-                       if (prevfd > 0) {
-                               dup2(prevfd, 0);
-                               close(prevfd);
-                       }
-                       if (pip[1] > 1) {
-                               dup2(pip[1], 1);
-                               close(pip[1]);
-                       }
-                       evaltreenr(lp->n, flags);
-                       /* never returns */
-               }
-               if (prevfd >= 0)
-                       close(prevfd);
-               prevfd = pip[0];
-               close(pip[1]);
-       }
-       if (n->npipe.backgnd == 0) {
-               exitstatus = waitforjob(jp);
-               TRACE(("evalpipe:  job done exit status %d\n", exitstatus));
-       }
-       INT_ON;
+#if JOBS
+       if (jobctl)
+               flags |= WUNTRACED;
+#endif
+       if (block == 0)
+               flags |= WNOHANG;
+       return wait3(status, flags, (struct rusage *)NULL);
 }
 
-
 /*
- * Execute a command inside back quotes.  If it's a builtin command, we
- * want to save its output in a block obtained from malloc.  Otherwise
- * we fork off a subprocess and get the output of the command via a pipe.
- * Should be called with interrupts off.
+ * Wait for a process to terminate.
  */
-static void
-evalbackcmd(union node *n, struct backcmd *result)
+static int
+dowait(int block, struct job *job)
 {
-       int saveherefd;
+       int pid;
+       int status;
+       struct job *jp;
+       struct job *thisjob;
+       int state;
 
-       result->fd = -1;
-       result->buf = NULL;
-       result->nleft = 0;
-       result->jp = NULL;
-       if (n == NULL) {
-               goto out;
+       TRACE(("dowait(%d) called\n", block));
+       pid = waitproc(block, &status);
+       TRACE(("wait returns pid %d, status=%d\n", pid, status));
+       if (pid <= 0)
+               return pid;
+       INT_OFF;
+       thisjob = NULL;
+       for (jp = curjob; jp; jp = jp->prev_job) {
+               struct procstat *sp;
+               struct procstat *spend;
+               if (jp->state == JOBDONE)
+                       continue;
+               state = JOBDONE;
+               spend = jp->ps + jp->nprocs;
+               sp = jp->ps;
+               do {
+                       if (sp->pid == pid) {
+                               TRACE(("Job %d: changing status of proc %d "
+                                       "from 0x%x to 0x%x\n",
+                                       jobno(jp), pid, sp->status, status));
+                               sp->status = status;
+                               thisjob = jp;
+                       }
+                       if (sp->status == -1)
+                               state = JOBRUNNING;
+#if JOBS
+                       if (state == JOBRUNNING)
+                               continue;
+                       if (WIFSTOPPED(sp->status)) {
+                               jp->stopstatus = sp->status;
+                               state = JOBSTOPPED;
+                       }
+#endif
+               } while (++sp < spend);
+               if (thisjob)
+                       goto gotjob;
        }
+#if JOBS
+       if (!WIFSTOPPED(status))
+#endif
 
-       saveherefd = herefd;
-       herefd = -1;
+               jobless--;
+       goto out;
 
-       {
-               int pip[2];
-               struct job *jp;
+ gotjob:
+       if (state != JOBRUNNING) {
+               thisjob->changed = 1;
 
-               if (pipe(pip) < 0)
-                       ash_msg_and_raise_error("Pipe call failed");
-               jp = makejob(n, 1);
-               if (forkshell(jp, n, FORK_NOJOB) == 0) {
-                       FORCE_INT_ON;
-                       close(pip[0]);
-                       if (pip[1] != 1) {
-                               close(1);
-                               copyfd(pip[1], 1);
-                               close(pip[1]);
+               if (thisjob->state != state) {
+                       TRACE(("Job %d: changing state from %d to %d\n",
+                               jobno(thisjob), thisjob->state, state));
+                       thisjob->state = state;
+#if JOBS
+                       if (state == JOBSTOPPED) {
+                               set_curjob(thisjob, CUR_STOPPED);
                        }
-                       eflag = 0;
-                       evaltreenr(n, EV_EXIT);
-                       /* NOTREACHED */
+#endif
                }
-               close(pip[1]);
-               result->fd = pip[0];
-               result->jp = jp;
        }
-       herefd = saveherefd;
+
  out:
-       TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
-               result->fd, result->buf, result->nleft, result->jp));
+       INT_ON;
+
+       if (thisjob && thisjob == job) {
+               char s[48 + 1];
+               int len;
+
+               len = sprint_status(s, status, 1);
+               if (len) {
+                       s[len] = '\n';
+                       s[len + 1] = 0;
+                       out2str(s);
+               }
+       }
+       return pid;
 }
 
-#if ENABLE_ASH_CMDCMD
-static char **
-parse_command_args(char **argv, const char **path)
+#if JOBS
+static void
+showjob(FILE *out, struct job *jp, int mode)
 {
-       char *cp, c;
+       struct procstat *ps;
+       struct procstat *psend;
+       int col;
+       int indent_col;
+       char s[80];
 
-       for (;;) {
-               cp = *++argv;
-               if (!cp)
-                       return 0;
-               if (*cp++ != '-')
-                       break;
-               c = *cp++;
-               if (!c)
+       ps = jp->ps;
+
+       if (mode & SHOW_PGID) {
+               /* just output process (group) id of pipeline */
+               fprintf(out, "%d\n", ps->pid);
+               return;
+       }
+
+       col = fmtstr(s, 16, "[%d]   ", jobno(jp));
+       indent_col = col;
+
+       if (jp == curjob)
+               s[col - 2] = '+';
+       else if (curjob && jp == curjob->prev_job)
+               s[col - 2] = '-';
+
+       if (mode & SHOW_PID)
+               col += fmtstr(s + col, 16, "%d ", ps->pid);
+
+       psend = ps + jp->nprocs;
+
+       if (jp->state == JOBRUNNING) {
+               strcpy(s + col, "Running");
+               col += sizeof("Running") - 1;
+       } else {
+               int status = psend[-1].status;
+               if (jp->state == JOBSTOPPED)
+                       status = jp->stopstatus;
+               col += sprint_status(s + col, status, 0);
+       }
+
+       goto start;
+
+       do {
+               /* for each process */
+               col = fmtstr(s, 48, " |\n%*c%d ", indent_col, ' ', ps->pid) - 3;
+ start:
+               fprintf(out, "%s%*c%s",
+                       s, 33 - col >= 0 ? 33 - col : 0, ' ', ps->cmd
+               );
+               if (!(mode & SHOW_PID)) {
+                       showpipe(jp, out);
                        break;
-               if (c == '-' && !*cp) {
-                       argv++;
+               }
+               if (++ps == psend) {
+                       outcslow('\n', out);
                        break;
                }
-               do {
-                       switch (c) {
-                       case 'p':
-                               *path = defpath;
-                               break;
-                       default:
-                               /* run 'typecmd' for other options */
-                               return 0;
-                       }
-                       c = *cp++;
-               } while (c);
-       }
-       return argv;
-}
-#endif
+       } while (1);
 
-static int isassignment(const char *p)
-{
-       const char *q = endofname(p);
-       if (p == q)
-               return 0;
-       return *q == '=';
+       jp->changed = 0;
+
+       if (jp->state == JOBDONE) {
+               TRACE(("showjob: freeing job %d\n", jobno(jp)));
+               freejob(jp);
+       }
 }
 
 /*
- * Execute a simple command.
+ * Print a list of jobs.  If "change" is nonzero, only print jobs whose
+ * statuses have changed since the last call to showjobs.
  */
 static void
-evalcommand(union node *cmd, int flags)
+showjobs(FILE *out, int mode)
 {
-       struct stackmark smark;
-       union node *argp;
-       struct arglist arglist;
-       struct arglist varlist;
-       char **argv;
-       int argc;
-       const struct strlist *sp;
-       struct cmdentry cmdentry;
        struct job *jp;
-       char *lastarg;
-       const char *path;
-       int spclbltin;
-       int cmd_is_exec;
-       int status;
-       char **nargv;
-       struct builtincmd *bcmd;
-       int pseudovarflag = 0;
 
-       /* First expand the arguments. */
-       TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
-       setstackmark(&smark);
-       back_exitstatus = 0;
+       TRACE(("showjobs(%x) called\n", mode));
 
-       cmdentry.cmdtype = CMDBUILTIN;
-       cmdentry.u.cmd = &bltin;
-       varlist.lastp = &varlist.list;
-       *varlist.lastp = NULL;
-       arglist.lastp = &arglist.list;
-       *arglist.lastp = NULL;
+       /* If not even one one job changed, there is nothing to do */
+       while (dowait(DOWAIT_NORMAL, NULL) > 0)
+               continue;
 
-       argc = 0;
-       if (cmd->ncmd.args) {
-               bcmd = find_builtin(cmd->ncmd.args->narg.text);
-               pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd);
+       for (jp = curjob; jp; jp = jp->prev_job) {
+               if (!(mode & SHOW_CHANGED) || jp->changed) {
+                       showjob(out, jp, mode);
+               }
        }
+}
 
-       for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) {
-               struct strlist **spp;
+static int
+jobscmd(int argc, char **argv)
+{
+       int mode, m;
 
-               spp = arglist.lastp;
-               if (pseudovarflag && isassignment(argp->narg.text))
-                       expandarg(argp, &arglist, EXP_VARTILDE);
+       mode = 0;
+       while ((m = nextopt("lp"))) {
+               if (m == 'l')
+                       mode = SHOW_PID;
                else
-                       expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
-
-               for (sp = *spp; sp; sp = sp->next)
-                       argc++;
-       }
-
-       argv = nargv = stalloc(sizeof(char *) * (argc + 1));
-       for (sp = arglist.list; sp; sp = sp->next) {
-               TRACE(("evalcommand arg: %s\n", sp->text));
-               *nargv++ = sp->text;
+                       mode = SHOW_PGID;
        }
-       *nargv = NULL;
 
-       lastarg = NULL;
-       if (iflag && funcnest == 0 && argc > 0)
-               lastarg = nargv[-1];
+       argv = argptr;
+       if (*argv) {
+               do
+                       showjob(stdout, getjob(*argv,0), mode);
+               while (*++argv);
+       } else
+               showjobs(stdout, mode);
 
-       preverrout_fd = 2;
-       expredir(cmd->ncmd.redirect);
-       status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH|REDIR_SAVEFD2);
-
-       path = vpath.text;
-       for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
-               struct strlist **spp;
-               char *p;
-
-               spp = varlist.lastp;
-               expandarg(argp, &varlist, EXP_VARTILDE);
-
-               /*
-                * Modify the command lookup path, if a PATH= assignment
-                * is present
-                */
-               p = (*spp)->text;
-               if (varequal(p, path))
-                       path = p;
-       }
-
-       /* Print the command if xflag is set. */
-       if (xflag) {
-               int n;
-               const char *p = " %s";
+       return 0;
+}
+#endif /* JOBS */
 
-               p++;
-               dprintf(preverrout_fd, p, expandstr(ps4val()));
+static int
+getstatus(struct job *job)
+{
+       int status;
+       int retval;
 
-               sp = varlist.list;
-               for (n = 0; n < 2; n++) {
-                       while (sp) {
-                               dprintf(preverrout_fd, p, sp->text);
-                               sp = sp->next;
-                               if (*p == '%') {
-                                       p--;
-                               }
-                       }
-                       sp = arglist.list;
+       status = job->ps[job->nprocs - 1].status;
+       retval = WEXITSTATUS(status);
+       if (!WIFEXITED(status)) {
+#if JOBS
+               retval = WSTOPSIG(status);
+               if (!WIFSTOPPED(status))
+#endif
+               {
+                       /* XXX: limits number of signals */
+                       retval = WTERMSIG(status);
+#if JOBS
+                       if (retval == SIGINT)
+                               job->sigint = 1;
+#endif
                }
-               full_write(preverrout_fd, "\n", 1);
+               retval += 128;
        }
+       TRACE(("getstatus: job %d, nproc %d, status %x, retval %x\n",
+               jobno(job), job->nprocs, status, retval));
+       return retval;
+}
 
-       cmd_is_exec = 0;
-       spclbltin = -1;
-
-       /* Now locate the command. */
-       if (argc) {
-               const char *oldpath;
-               int cmd_flag = DO_ERR;
+static int
+waitcmd(int argc, char **argv)
+{
+       struct job *job;
+       int retval;
+       struct job *jp;
 
-               path += 5;
-               oldpath = path;
-               for (;;) {
-                       find_command(argv[0], &cmdentry, cmd_flag, path);
-                       if (cmdentry.cmdtype == CMDUNKNOWN) {
-                               status = 127;
-                               flush_stderr();
-                               goto bail;
-                       }
+       EXSIGON;
 
-                       /* implement bltin and command here */
-                       if (cmdentry.cmdtype != CMDBUILTIN)
-                               break;
-                       if (spclbltin < 0)
-                               spclbltin = IS_BUILTIN_SPECIAL(cmdentry.u.cmd);
-                       if (cmdentry.u.cmd == EXECCMD)
-                               cmd_is_exec++;
-#if ENABLE_ASH_CMDCMD
-                       if (cmdentry.u.cmd == COMMANDCMD) {
+       nextopt(nullstr);
+       retval = 0;
 
-                               path = oldpath;
-                               nargv = parse_command_args(argv, &path);
-                               if (!nargv)
+       argv = argptr;
+       if (!*argv) {
+               /* wait for all jobs */
+               for (;;) {
+                       jp = curjob;
+                       while (1) {
+                               if (!jp) {
+                                       /* no running procs */
+                                       goto out;
+                               }
+                               if (jp->state == JOBRUNNING)
                                        break;
-                               argc -= nargv - argv;
-                               argv = nargv;
-                               cmd_flag |= DO_NOFUNC;
-                       } else
-#endif
-                               break;
+                               jp->waited = 1;
+                               jp = jp->prev_job;
+                       }
+                       dowait(DOWAIT_BLOCK, 0);
                }
        }
 
-       if (status) {
-               /* We have a redirection error. */
-               if (spclbltin > 0)
-                       raise_exception(EXERROR);
- bail:
-               exitstatus = status;
-               goto out;
-       }
+       retval = 127;
+       do {
+               if (**argv != '%') {
+                       pid_t pid = number(*argv);
+                       job = curjob;
+                       goto start;
+                       do {
+                               if (job->ps[job->nprocs - 1].pid == pid)
+                                       break;
+                               job = job->prev_job;
+ start:
+                               if (!job)
+                                       goto repeat;
+                       } while (1);
+               } else
+                       job = getjob(*argv, 0);
+               /* loop until process terminated or stopped */
+               while (job->state == JOBRUNNING)
+                       dowait(DOWAIT_BLOCK, 0);
+               job->waited = 1;
+               retval = getstatus(job);
+ repeat:
+               ;
+       } while (*++argv);
 
-       /* Execute the command. */
-       switch (cmdentry.cmdtype) {
-       default:
-               /* Fork off a child process if necessary. */
-               if (!(flags & EV_EXIT) || trap[0]) {
-                       INT_OFF;
-                       jp = makejob(cmd, 1);
-                       if (forkshell(jp, cmd, FORK_FG) != 0) {
-                               exitstatus = waitforjob(jp);
-                               INT_ON;
-                               break;
-                       }
-                       FORCE_INT_ON;
-               }
-               listsetvar(varlist.list, VEXPORT|VSTACK);
-               shellexec(argv, path, cmdentry.u.index);
-               /* NOTREACHED */
+ out:
+       return retval;
+}
 
-       case CMDBUILTIN:
-               cmdenviron = varlist.list;
-               if (cmdenviron) {
-                       struct strlist *list = cmdenviron;
-                       int i = VNOSET;
-                       if (spclbltin > 0 || argc == 0) {
-                               i = 0;
-                               if (cmd_is_exec && argc > 1)
-                                       i = VEXPORT;
-                       }
-                       listsetvar(list, i);
-               }
-               if (evalbltin(cmdentry.u.cmd, argc, argv)) {
-                       int exit_status;
-                       int i, j;
+static struct job *
+growjobtab(void)
+{
+       size_t len;
+       ptrdiff_t offset;
+       struct job *jp, *jq;
 
-                       i = exception;
-                       if (i == EXEXIT)
-                               goto raise;
+       len = njobs * sizeof(*jp);
+       jq = jobtab;
+       jp = ckrealloc(jq, len + 4 * sizeof(*jp));
 
-                       exit_status = 2;
-                       j = 0;
-                       if (i == EXINT)
-                               j = SIGINT;
-                       if (i == EXSIG)
-                               j = pendingsigs;
-                       if (j)
-                               exit_status = j + 128;
-                       exitstatus = exit_status;
+       offset = (char *)jp - (char *)jq;
+       if (offset) {
+               /* Relocate pointers */
+               size_t l = len;
 
-                       if (i == EXINT || spclbltin > 0) {
- raise:
-                               longjmp(exception_handler->loc, 1);
-                       }
-                       FORCE_INT_ON;
+               jq = (struct job *)((char *)jq + l);
+               while (l) {
+                       l -= sizeof(*jp);
+                       jq--;
+#define joff(p) ((struct job *)((char *)(p) + l))
+#define jmove(p) (p) = (void *)((char *)(p) + offset)
+                       if (joff(jp)->ps == &jq->ps0)
+                               jmove(joff(jp)->ps);
+                       if (joff(jp)->prev_job)
+                               jmove(joff(jp)->prev_job);
                }
-               break;
-
-       case CMDFUNCTION:
-               listsetvar(varlist.list, 0);
-               if (evalfun(cmdentry.u.func, argc, argv, flags))
-                       goto raise;
-               break;
+               if (curjob)
+                       jmove(curjob);
+#undef joff
+#undef jmove
        }
 
- out:
-       popredir(cmd_is_exec);
-       if (lastarg)
-               /* dsl: I think this is intended to be used to support
-                * '_' in 'vi' command mode during line editing...
-                * However I implemented that within libedit itself.
-                */
-               setvar("_", lastarg, 0);
-       popstackmark(&smark);
+       njobs += 4;
+       jobtab = jp;
+       jp = (struct job *)((char *)jp + len);
+       jq = jp + 3;
+       do {
+               jq->used = 0;
+       } while (--jq >= jp);
+       return jp;
 }
 
-static int
-evalbltin(const struct builtincmd *cmd, int argc, char **argv)
+/*
+ * Return a new job structure.
+ * Called with interrupts off.
+ */
+static struct job *
+makejob(union node *node, int nprocs)
 {
-       char *volatile savecmdname;
-       struct jmploc *volatile savehandler;
-       struct jmploc jmploc;
        int i;
+       struct job *jp;
 
-       savecmdname = commandname;
-       i = setjmp(jmploc.loc);
-       if (i)
-               goto cmddone;
-       savehandler = exception_handler;
-       exception_handler = &jmploc;
-       commandname = argv[0];
-       argptr = argv + 1;
-       optptr = NULL;                  /* initialize nextopt */
-       exitstatus = (*cmd->builtin)(argc, argv);
-       flush_stdout_stderr();
- cmddone:
-       exitstatus |= ferror(stdout);
-       clearerr(stdout);
-       commandname = savecmdname;
-       exsig = 0;
-       exception_handler = savehandler;
-
-       return i;
+       for (i = njobs, jp = jobtab; ; jp++) {
+               if (--i < 0) {
+                       jp = growjobtab();
+                       break;
+               }
+               if (jp->used == 0)
+                       break;
+               if (jp->state != JOBDONE || !jp->waited)
+                       continue;
+#if JOBS
+               if (jobctl)
+                       continue;
+#endif
+               freejob(jp);
+               break;
+       }
+       memset(jp, 0, sizeof(*jp));
+#if JOBS
+       /* jp->jobctl is a bitfield.
+        * "jp->jobctl |= jobctl" likely to give awful code */
+       if (jobctl)
+               jp->jobctl = 1;
+#endif
+       jp->prev_job = curjob;
+       curjob = jp;
+       jp->used = 1;
+       jp->ps = &jp->ps0;
+       if (nprocs > 1) {
+               jp->ps = ckmalloc(nprocs * sizeof(struct procstat));
+       }
+       TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
+                               jobno(jp)));
+       return jp;
 }
 
-static struct localvar *localvars;
-
+#if JOBS
 /*
- * Called after a function returns.
- * Interrupts must be off.
+ * Return a string identifying a command (to be printed by the
+ * jobs command).
  */
+static char *cmdnextc;
+
 static void
-poplocalvars(void)
+cmdputs(const char *s)
 {
-       struct localvar *lvp;
-       struct var *vp;
+       const char *p, *str;
+       char c, cc[2] = " ";
+       char *nextc;
+       int subtype = 0;
+       int quoted = 0;
+       static const char vstype[VSTYPE + 1][4] = {
+               "", "}", "-", "+", "?", "=",
+               "%", "%%", "#", "##"
+       };
 
-       while ((lvp = localvars) != NULL) {
-               localvars = lvp->next;
-               vp = lvp->vp;
-               TRACE(("poplocalvar %s", vp ? vp->text : "-"));
-               if (vp == NULL) {       /* $- saved */
-                       memcpy(optlist, lvp->text, sizeof(optlist));
-                       free((char*)lvp->text);
-                       optschanged();
-               } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
-                       unsetvar(vp->text);
-               } else {
-                       if (vp->func)
-                               (*vp->func)(strchrnul(lvp->text, '=') + 1);
-                       if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
-                               free((char*)vp->text);
-                       vp->flags = lvp->flags;
-                       vp->text = lvp->text;
+       nextc = makestrspace((strlen(s) + 1) * 8, cmdnextc);
+       p = s;
+       while ((c = *p++) != 0) {
+               str = 0;
+               switch (c) {
+               case CTLESC:
+                       c = *p++;
+                       break;
+               case CTLVAR:
+                       subtype = *p++;
+                       if ((subtype & VSTYPE) == VSLENGTH)
+                               str = "${#";
+                       else
+                               str = "${";
+                       if (!(subtype & VSQUOTE) == !(quoted & 1))
+                               goto dostr;
+                       quoted ^= 1;
+                       c = '"';
+                       break;
+               case CTLENDVAR:
+                       str = "\"}" + !(quoted & 1);
+                       quoted >>= 1;
+                       subtype = 0;
+                       goto dostr;
+               case CTLBACKQ:
+                       str = "$(...)";
+                       goto dostr;
+               case CTLBACKQ+CTLQUOTE:
+                       str = "\"$(...)\"";
+                       goto dostr;
+#if ENABLE_ASH_MATH_SUPPORT
+               case CTLARI:
+                       str = "$((";
+                       goto dostr;
+               case CTLENDARI:
+                       str = "))";
+                       goto dostr;
+#endif
+               case CTLQUOTEMARK:
+                       quoted ^= 1;
+                       c = '"';
+                       break;
+               case '=':
+                       if (subtype == 0)
+                               break;
+                       if ((subtype & VSTYPE) != VSNORMAL)
+                               quoted <<= 1;
+                       str = vstype[subtype & VSTYPE];
+                       if (subtype & VSNUL)
+                               c = ':';
+                       else
+                               goto checkstr;
+                       break;
+               case '\'':
+               case '\\':
+               case '"':
+               case '$':
+                       /* These can only happen inside quotes */
+                       cc[0] = c;
+                       str = cc;
+                       c = '\\';
+                       break;
+               default:
+                       break;
+               }
+               USTPUTC(c, nextc);
+ checkstr:
+               if (!str)
+                       continue;
+ dostr:
+               while ((c = *str++)) {
+                       USTPUTC(c, nextc);
                }
-               free(lvp);
        }
-}
-
-static int
-evalfun(struct funcnode *func, int argc, char **argv, int flags)
-{
-       volatile struct shparam saveparam;
-       struct localvar *volatile savelocalvars;
-       struct jmploc *volatile savehandler;
-       struct jmploc jmploc;
-       int e;
-
-       saveparam = shellparam;
-       savelocalvars = localvars;
-       e = setjmp(jmploc.loc);
-       if (e) {
-               goto funcdone;
+       if (quoted & 1) {
+               USTPUTC('"', nextc);
        }
-       INT_OFF;
-       savehandler = exception_handler;
-       exception_handler = &jmploc;
-       localvars = NULL;
-       shellparam.malloc = 0;
-       func->count++;
-       funcnest++;
-       INT_ON;
-       shellparam.nparam = argc - 1;
-       shellparam.p = argv + 1;
-#if ENABLE_ASH_GETOPTS
-       shellparam.optind = 1;
-       shellparam.optoff = -1;
-#endif
-       evaltree(&func->n, flags & EV_TESTED);
-funcdone:
-       INT_OFF;
-       funcnest--;
-       freefunc(func);
-       poplocalvars();
-       localvars = savelocalvars;
-       freeparam(&shellparam);
-       shellparam = saveparam;
-       exception_handler = savehandler;
-       INT_ON;
-       evalskip &= ~SKIPFUNC;
-       return e;
+       *nextc = 0;
+       cmdnextc = nextc;
 }
 
+/* cmdtxt() and cmdlist() call each other */
+static void cmdtxt(union node *n);
 
-static int
-goodname(const char *p)
+static void
+cmdlist(union node *np, int sep)
 {
-       return !*endofname(p);
+       for (; np; np = np->narg.next) {
+               if (!sep)
+                       cmdputs(" ");
+               cmdtxt(np);
+               if (sep && np->narg.next)
+                       cmdputs(" ");
+       }
 }
 
-
-/*
- * Search for a command.  This is called before we fork so that the
- * location of the command will be available in the parent as well as
- * the child.  The check for "goodname" is an overly conservative
- * check that the name will not be subject to expansion.
- */
 static void
-prehash(union node *n)
+cmdtxt(union node *n)
 {
-       struct cmdentry entry;
-
-       if (n->type == NCMD && n->ncmd.args && goodname(n->ncmd.args->narg.text))
-               find_command(n->ncmd.args->narg.text, &entry, 0, pathval());
-}
-
-
-
-/*
- * Builtin commands.  Builtin commands whose functions are closely
- * tied to evaluation are implemented here.
- */
+       union node *np;
+       struct nodelist *lp;
+       const char *p;
+       char s[2];
 
-/*
- * No command given.
- */
-static int
-bltincmd(int argc, char **argv)
-{
-       /*
-        * Preserve exitstatus of a previous possible redirection
-        * as POSIX mandates
-        */
-       return back_exitstatus;
+       if (!n)
+               return;
+       switch (n->type) {
+       default:
+#if DEBUG
+               abort();
+#endif
+       case NPIPE:
+               lp = n->npipe.cmdlist;
+               for (;;) {
+                       cmdtxt(lp->n);
+                       lp = lp->next;
+                       if (!lp)
+                               break;
+                       cmdputs(" | ");
+               }
+               break;
+       case NSEMI:
+               p = "; ";
+               goto binop;
+       case NAND:
+               p = " && ";
+               goto binop;
+       case NOR:
+               p = " || ";
+ binop:
+               cmdtxt(n->nbinary.ch1);
+               cmdputs(p);
+               n = n->nbinary.ch2;
+               goto donode;
+       case NREDIR:
+       case NBACKGND:
+               n = n->nredir.n;
+               goto donode;
+       case NNOT:
+               cmdputs("!");
+               n = n->nnot.com;
+ donode:
+               cmdtxt(n);
+               break;
+       case NIF:
+               cmdputs("if ");
+               cmdtxt(n->nif.test);
+               cmdputs("; then ");
+               n = n->nif.ifpart;
+               if (n->nif.elsepart) {
+                       cmdtxt(n);
+                       cmdputs("; else ");
+                       n = n->nif.elsepart;
+               }
+               p = "; fi";
+               goto dotail;
+       case NSUBSHELL:
+               cmdputs("(");
+               n = n->nredir.n;
+               p = ")";
+               goto dotail;
+       case NWHILE:
+               p = "while ";
+               goto until;
+       case NUNTIL:
+               p = "until ";
+ until:
+               cmdputs(p);
+               cmdtxt(n->nbinary.ch1);
+               n = n->nbinary.ch2;
+               p = "; done";
+ dodo:
+               cmdputs("; do ");
+ dotail:
+               cmdtxt(n);
+               goto dotail2;
+       case NFOR:
+               cmdputs("for ");
+               cmdputs(n->nfor.var);
+               cmdputs(" in ");
+               cmdlist(n->nfor.args, 1);
+               n = n->nfor.body;
+               p = "; done";
+               goto dodo;
+       case NDEFUN:
+               cmdputs(n->narg.text);
+               p = "() { ... }";
+               goto dotail2;
+       case NCMD:
+               cmdlist(n->ncmd.args, 1);
+               cmdlist(n->ncmd.redirect, 0);
+               break;
+       case NARG:
+               p = n->narg.text;
+ dotail2:
+               cmdputs(p);
+               break;
+       case NHERE:
+       case NXHERE:
+               p = "<<...";
+               goto dotail2;
+       case NCASE:
+               cmdputs("case ");
+               cmdputs(n->ncase.expr->narg.text);
+               cmdputs(" in ");
+               for (np = n->ncase.cases; np; np = np->nclist.next) {
+                       cmdtxt(np->nclist.pattern);
+                       cmdputs(") ");
+                       cmdtxt(np->nclist.body);
+                       cmdputs(";; ");
+               }
+               p = "esac";
+               goto dotail2;
+       case NTO:
+               p = ">";
+               goto redir;
+       case NCLOBBER:
+               p = ">|";
+               goto redir;
+       case NAPPEND:
+               p = ">>";
+               goto redir;
+       case NTOFD:
+               p = ">&";
+               goto redir;
+       case NFROM:
+               p = "<";
+               goto redir;
+       case NFROMFD:
+               p = "<&";
+               goto redir;
+       case NFROMTO:
+               p = "<>";
+ redir:
+               s[0] = n->nfile.fd + '0';
+               s[1] = '\0';
+               cmdputs(s);
+               cmdputs(p);
+               if (n->type == NTOFD || n->type == NFROMFD) {
+                       s[0] = n->ndup.dupfd + '0';
+                       p = s;
+                       goto dotail2;
+               }
+               n = n->nfile.fname;
+               goto donode;
+       }
 }
 
-
-/*
- * Handle break and continue commands.  Break, continue, and return are
- * all handled by setting the evalskip flag.  The evaluation routines
- * above all check this flag, and if it is set they start skipping
- * commands rather than executing them.  The variable skipcount is
- * the number of loops to break/continue, or the number of function
- * levels to return.  (The latter is always 1.)  It should probably
- * be an error to break out of more loops than exist, but it isn't
- * in the standard shell so we don't make it one here.
- */
-
-static int
-breakcmd(int argc, char **argv)
+static char *
+commandtext(union node *n)
 {
-       int n = argc > 1 ? number(argv[1]) : 1;
+       char *name;
 
-       if (n <= 0)
-               ash_msg_and_raise_error(illnum, argv[1]);
-       if (n > loopnest)
-               n = loopnest;
-       if (n > 0) {
-               evalskip = (**argv == 'c')? SKIPCONT : SKIPBREAK;
-               skipcount = n;
-       }
-       return 0;
+       STARTSTACKSTR(cmdnextc);
+       cmdtxt(n);
+       name = stackblock();
+       TRACE(("commandtext: name %p, end %p\n\t\"%s\"\n",
+                       name, cmdnextc, cmdnextc));
+       return ckstrdup(name);
 }
-
+#endif /* JOBS */
 
 /*
- * The return command.
+ * Fork off a subshell.  If we are doing job control, give the subshell its
+ * own process group.  Jp is a job structure that the job is to be added to.
+ * N is the command that will be evaluated by the child.  Both jp and n may
+ * be NULL.  The mode parameter can be one of the following:
+ *      FORK_FG - Fork off a foreground process.
+ *      FORK_BG - Fork off a background process.
+ *      FORK_NOJOB - Like FORK_FG, but don't give the process its own
+ *                   process group even if job control is on.
+ *
+ * When job control is turned off, background processes have their standard
+ * input redirected to /dev/null (except for the second and later processes
+ * in a pipeline).
+ *
+ * Called with interrupts off.
  */
-static int
-returncmd(int argc, char **argv)
-{
-       /*
-        * If called outside a function, do what ksh does;
-        * skip the rest of the file.
-        */
-       evalskip = funcnest ? SKIPFUNC : SKIPFILE;
-       return argv[1] ? number(argv[1]) : exitstatus;
-}
-
-
-static int
-falsecmd(int argc, char **argv)
+/*
+ * Clear traps on a fork.
+ */
+static void
+clear_traps(void)
 {
-       return 1;
-}
-
+       char **tp;
 
-static int
-truecmd(int argc, char **argv)
-{
-       return 0;
+       for (tp = trap; tp < &trap[NSIG]; tp++) {
+               if (*tp && **tp) {      /* trap not NULL or SIG_IGN */
+                       INT_OFF;
+                       free(*tp);
+                       *tp = NULL;
+                       if (tp != &trap[0])
+                               setsignal(tp - trap);
+                       INT_ON;
+               }
+       }
 }
 
+/* Lives far away from here, needed for forkchild */
+static void closescript(void);
 
-static int
-execcmd(int argc, char **argv)
+/* Called after fork(), in child */
+static void
+forkchild(struct job *jp, union node *n, int mode)
 {
-       if (argc > 1) {
-               iflag = 0;              /* exit on error */
-               mflag = 0;
-               optschanged();
-               shellexec(argv + 1, pathval(), 0);
-       }
-       return 0;
-}
+       int oldlvl;
 
+       TRACE(("Child shell %d\n", getpid()));
+       oldlvl = shlvl;
+       shlvl++;
 
-/*      exec.c    */
+       closescript();
+       clear_traps();
+#if JOBS
+       /* do job control only in root shell */
+       jobctl = 0;
+       if (mode != FORK_NOJOB && jp->jobctl && !oldlvl) {
+               pid_t pgrp;
 
-/*
- * When commands are first encountered, they are entered in a hash table.
- * This ensures that a full path search will not have to be done for them
- * on each invocation.
- *
- * We should investigate converting to a linear search, even though that
- * would make the command name "hash" a misnomer.
- */
-
-#define CMDTABLESIZE 31         /* should be prime */
-#define ARB 1                   /* actual size determined at run time */
-
-
-struct tblentry {
-       struct tblentry *next;  /* next entry in hash chain */
-       union param param;      /* definition of builtin function */
-       short cmdtype;          /* index identifying command */
-       char rehash;            /* if set, cd done since entry created */
-       char cmdname[ARB];      /* name of command */
-};
-
-
-static struct tblentry *cmdtable[CMDTABLESIZE];
-static int builtinloc = -1;             /* index in path of %builtin, or -1 */
-
-
-static void tryexec(char *, char **, char **);
-static void clearcmdentry(int);
-static struct tblentry *cmdlookup(const char *, int);
-static void delete_cmd_entry(void);
-
-
-/*
- * Exec a program.  Never returns.  If you change this routine, you may
- * have to change the find_command routine as well.
- */
-#define environment() listvars(VEXPORT, VUNSET, 0)
-static void shellexec(char **, const char *, int) ATTRIBUTE_NORETURN;
-static void
-shellexec(char **argv, const char *path, int idx)
-{
-       char *cmdname;
-       int e;
-       char **envp;
-       int exerrno;
-
-       clearredir(1);
-       envp = environment();
-       if (strchr(argv[0], '/') || is_safe_applet(argv[0])
-#if ENABLE_FEATURE_SH_STANDALONE_SHELL
-        || find_applet_by_name(argv[0])
+               if (jp->nprocs == 0)
+                       pgrp = getpid();
+               else
+                       pgrp = jp->ps[0].pid;
+               /* This can fail because we are doing it in the parent also */
+               (void)setpgid(0, pgrp);
+               if (mode == FORK_FG)
+                       xtcsetpgrp(ttyfd, pgrp);
+               setsignal(SIGTSTP);
+               setsignal(SIGTTOU);
+       } else
 #endif
-       ) {
-               tryexec(argv[0], argv, envp);
-               e = errno;
-       } else {
-               e = ENOENT;
-               while ((cmdname = padvance(&path, argv[0])) != NULL) {
-                       if (--idx < 0 && pathopt == NULL) {
-                               tryexec(cmdname, argv, envp);
-                               if (errno != ENOENT && errno != ENOTDIR)
-                                       e = errno;
-                       }
-                       stunalloc(cmdname);
+       if (mode == FORK_BG) {
+               ignoresig(SIGINT);
+               ignoresig(SIGQUIT);
+               if (jp->nprocs == 0) {
+                       close(0);
+                       if (open(bb_dev_null, O_RDONLY) != 0)
+                               ash_msg_and_raise_error("can't open %s", bb_dev_null);
                }
        }
-
-       /* Map to POSIX errors */
-       switch (e) {
-       case EACCES:
-               exerrno = 126;
-               break;
-       case ENOENT:
-               exerrno = 127;
-               break;
-       default:
-               exerrno = 2;
-               break;
+       if (!oldlvl && iflag) {
+               setsignal(SIGINT);
+               setsignal(SIGQUIT);
+               setsignal(SIGTERM);
        }
-       exitstatus = exerrno;
-       TRACE(("shellexec failed for %s, errno %d, suppressint %d\n",
-               argv[0], e, suppressint ));
-       ash_msg_and_raise(EXEXEC, "%s: %s", argv[0], errmsg(e, "not found"));
-       /* NOTREACHED */
+       for (jp = curjob; jp; jp = jp->prev_job)
+               freejob(jp);
+       jobless = 0;
 }
 
-
+/* Called after fork(), in parent */
 static void
-tryexec(char *cmd, char **argv, char **envp)
+forkparent(struct job *jp, union node *n, int mode, pid_t pid)
 {
-       int repeated = 0;
-       struct BB_applet *a;
-       int argc = 0;
-       char **c;
-
-       if (strchr(cmd, '/') == NULL
-        && (a = find_applet_by_name(cmd)) != NULL
-        && is_safe_applet(cmd)
-       ) {
-               c = argv;
-               while (*c != NULL) {
-                       c++; argc++;
-               }
-               applet_name = cmd;
-               exit(a->main(argc, argv));
+       TRACE(("In parent shell: child = %d\n", pid));
+       if (!jp) {
+               while (jobless && dowait(DOWAIT_NORMAL, 0) > 0);
+               jobless++;
+               return;
        }
-#if ENABLE_FEATURE_SH_STANDALONE_SHELL
-       if (find_applet_by_name(cmd) != NULL) {
-               /* re-exec ourselves with the new arguments */
-               execve(CONFIG_BUSYBOX_EXEC_PATH, argv, envp);
-               /* If they called chroot or otherwise made the binary no longer
-                * executable, fall through */
+#if JOBS
+       if (mode != FORK_NOJOB && jp->jobctl) {
+               int pgrp;
+
+               if (jp->nprocs == 0)
+                       pgrp = pid;
+               else
+                       pgrp = jp->ps[0].pid;
+               /* This can fail because we are doing it in the child also */
+               setpgid(pid, pgrp);
        }
 #endif
-
- repeat:
-#ifdef SYSV
-       do {
-               execve(cmd, argv, envp);
-       } while (errno == EINTR);
-#else
-       execve(cmd, argv, envp);
+       if (mode == FORK_BG) {
+               backgndpid = pid;               /* set $! */
+               set_curjob(jp, CUR_RUNNING);
+       }
+       if (jp) {
+               struct procstat *ps = &jp->ps[jp->nprocs++];
+               ps->pid = pid;
+               ps->status = -1;
+               ps->cmd = nullstr;
+#if JOBS
+               if (jobctl && n)
+                       ps->cmd = commandtext(n);
 #endif
-       if (repeated++) {
-               free(argv);
-       } else if (errno == ENOEXEC) {
-               char **ap;
-               char **new;
-
-               for (ap = argv; *ap; ap++)
-                       ;
-               ap = new = ckmalloc((ap - argv + 2) * sizeof(char *));
-               ap[1] = cmd;
-               *ap = cmd = (char *)DEFAULT_SHELL;
-               ap += 2;
-               argv++;
-               while ((*ap++ = *argv++))
-                       ;
-               argv = new;
-               goto repeat;
        }
 }
 
-
-/*** Command hashing code ***/
-
-static void
-printentry(struct tblentry *cmdp)
+static int
+forkshell(struct job *jp, union node *n, int mode)
 {
-       int idx;
-       const char *path;
-       char *name;
+       int pid;
 
-       idx = cmdp->param.index;
-       path = pathval();
-       do {
-               name = padvance(&path, cmdp->cmdname);
-               stunalloc(name);
-       } while (--idx >= 0);
-       out1fmt("%s%s\n", name, (cmdp->rehash ? "*" : nullstr));
+       TRACE(("forkshell(%%%d, %p, %d) called\n", jobno(jp), n, mode));
+       pid = fork();
+       if (pid < 0) {
+               TRACE(("Fork failed, errno=%d", errno));
+               if (jp)
+                       freejob(jp);
+               ash_msg_and_raise_error("cannot fork");
+       }
+       if (pid == 0)
+               forkchild(jp, n, mode);
+       else
+               forkparent(jp, n, mode, pid);
+       return pid;
 }
 
-
+/*
+ * Wait for job to finish.
+ *
+ * Under job control we have the problem that while a child process is
+ * running interrupts generated by the user are sent to the child but not
+ * to the shell.  This means that an infinite loop started by an inter-
+ * active user may be hard to kill.  With job control turned off, an
+ * interactive user may place an interactive program inside a loop.  If
+ * the interactive program catches interrupts, the user doesn't want
+ * these interrupts to also abort the loop.  The approach we take here
+ * is to have the shell ignore interrupt signals while waiting for a
+ * foreground process to terminate, and then send itself an interrupt
+ * signal if the child process was terminated by an interrupt signal.
+ * Unfortunately, some programs want to do a bit of cleanup and then
+ * exit on interrupt; unless these processes terminate themselves by
+ * sending a signal to themselves (instead of calling exit) they will
+ * confuse this approach.
+ *
+ * Called with interrupts off.
+ */
 static int
-hashcmd(int argc, char **argv)
+waitforjob(struct job *jp)
 {
-       struct tblentry **pp;
-       struct tblentry *cmdp;
-       int c;
-       struct cmdentry entry;
-       char *name;
+       int st;
 
-       while ((c = nextopt("r")) != '\0') {
-               clearcmdentry(0);
-               return 0;
-       }
-       if (*argptr == NULL) {
-               for (pp = cmdtable; pp < &cmdtable[CMDTABLESIZE]; pp++) {
-                       for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
-                               if (cmdp->cmdtype == CMDNORMAL)
-                                       printentry(cmdp);
-                       }
-               }
-               return 0;
+       TRACE(("waitforjob(%%%d) called\n", jobno(jp)));
+       while (jp->state == JOBRUNNING) {
+               dowait(DOWAIT_BLOCK, jp);
        }
-       c = 0;
-       while ((name = *argptr) != NULL) {
-               cmdp = cmdlookup(name, 0);
-               if (cmdp != NULL
-                && (cmdp->cmdtype == CMDNORMAL
-                    || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
-                       delete_cmd_entry();
-               find_command(name, &entry, DO_ERR, pathval());
-               if (entry.cmdtype == CMDUNKNOWN)
-                       c = 1;
-               argptr++;
+       st = getstatus(jp);
+#if JOBS
+       if (jp->jobctl) {
+               xtcsetpgrp(ttyfd, rootpid);
+               /*
+                * This is truly gross.
+                * If we're doing job control, then we did a TIOCSPGRP which
+                * caused us (the shell) to no longer be in the controlling
+                * session -- so we wouldn't have seen any ^C/SIGINT.  So, we
+                * intuit from the subprocess exit status whether a SIGINT
+                * occurred, and if so interrupt ourselves.  Yuck.  - mycroft
+                */
+               if (jp->sigint)
+                       raise(SIGINT);
        }
-       return c;
+       if (jp->state == JOBDONE)
+#endif
+               freejob(jp);
+       return st;
 }
 
-
 /*
- * Resolve a command name.  If you change this routine, you may have to
- * change the shellexec routine as well.
+ * return 1 if there are stopped jobs, otherwise 0
  */
-static void
-find_command(char *name, struct cmdentry *entry, int act, const char *path)
+static int
+stoppedjobs(void)
 {
-       struct tblentry *cmdp;
-       int idx;
-       int prev;
-       char *fullname;
-       struct stat statb;
-       int e;
-       int updatetbl;
-       struct builtincmd *bcmd;
-
-       /* If name contains a slash, don't use PATH or hash table */
-       if (strchr(name, '/') != NULL) {
-               entry->u.index = -1;
-               if (act & DO_ABS) {
-                       while (stat(name, &statb) < 0) {
-#ifdef SYSV
-                               if (errno == EINTR)
-                                       continue;
-#endif
-                               entry->cmdtype = CMDUNKNOWN;
-                               return;
-                       }
-               }
-               entry->cmdtype = CMDNORMAL;
-               return;
-       }
-
-#if ENABLE_FEATURE_SH_STANDALONE_SHELL
-       if (find_applet_by_name(name)) {
-               entry->cmdtype = CMDNORMAL;
-               entry->u.index = -1;
-               return;
-       }
-#endif
+       struct job *jp;
+       int retval;
 
-       if (is_safe_applet(name)) {
-               entry->cmdtype = CMDNORMAL;
-               entry->u.index = -1;
-               return;
+       retval = 0;
+       if (job_warning)
+               goto out;
+       jp = curjob;
+       if (jp && jp->state == JOBSTOPPED) {
+               out2str("You have stopped jobs.\n");
+               job_warning = 2;
+               retval++;
        }
+ out:
+       return retval;
+}
 
-       updatetbl = (path == pathval());
-       if (!updatetbl) {
-               act |= DO_ALTPATH;
-               if (strstr(path, "%builtin") != NULL)
-                       act |= DO_ALTBLTIN;
-       }
 
-       /* If name is in the table, check answer will be ok */
-       cmdp = cmdlookup(name, 0);
-       if (cmdp != NULL) {
-               int bit;
+/* ============ redir.c
+ *
+ * Code for dealing with input/output redirection.
+ */
 
-               switch (cmdp->cmdtype) {
-               default:
-#if DEBUG
-                       abort();
+#define EMPTY -2                /* marks an unused slot in redirtab */
+#ifndef PIPE_BUF
+# define PIPESIZE 4096          /* amount of buffering in a pipe */
+#else
+# define PIPESIZE PIPE_BUF
 #endif
-               case CMDNORMAL:
-                       bit = DO_ALTPATH;
-                       break;
-               case CMDFUNCTION:
-                       bit = DO_NOFUNC;
-                       break;
-               case CMDBUILTIN:
-                       bit = DO_ALTBLTIN;
-                       break;
-               }
-               if (act & bit) {
-                       updatetbl = 0;
-                       cmdp = NULL;
-               } else if (cmdp->rehash == 0)
-                       /* if not invalidated by cd, we're done */
-                       goto success;
-       }
-
-       /* If %builtin not in path, check for builtin next */
-       bcmd = find_builtin(name);
-       if (bcmd && (IS_BUILTIN_REGULAR(bcmd) || (
-               act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : builtinloc <= 0
-       )))
-               goto builtin_success;
 
-       /* We have to search path. */
-       prev = -1;              /* where to start */
-       if (cmdp && cmdp->rehash) {     /* doing a rehash */
-               if (cmdp->cmdtype == CMDBUILTIN)
-                       prev = builtinloc;
-               else
-                       prev = cmdp->param.index;
-       }
+/*
+ * Open a file in noclobber mode.
+ * The code was copied from bash.
+ */
+static int
+noclobberopen(const char *fname)
+{
+       int r, fd;
+       struct stat finfo, finfo2;
 
-       e = ENOENT;
-       idx = -1;
- loop:
-       while ((fullname = padvance(&path, name)) != NULL) {
-               stunalloc(fullname);
-               idx++;
-               if (pathopt) {
-                       if (prefix(pathopt, "builtin")) {
-                               if (bcmd)
-                                       goto builtin_success;
-                               continue;
-                       } else if (!(act & DO_NOFUNC) &&
-                                  prefix(pathopt, "func")) {
-                               /* handled below */
-                       } else {
-                               /* ignore unimplemented options */
-                               continue;
-                       }
-               }
-               /* if rehash, don't redo absolute path names */
-               if (fullname[0] == '/' && idx <= prev) {
-                       if (idx < prev)
-                               continue;
-                       TRACE(("searchexec \"%s\": no change\n", name));
-                       goto success;
-               }
-               while (stat(fullname, &statb) < 0) {
-#ifdef SYSV
-                       if (errno == EINTR)
-                               continue;
-#endif
-                       if (errno != ENOENT && errno != ENOTDIR)
-                               e = errno;
-                       goto loop;
-               }
-               e = EACCES;     /* if we fail, this will be the error */
-               if (!S_ISREG(statb.st_mode))
-                       continue;
-               if (pathopt) {          /* this is a %func directory */
-                       stalloc(strlen(fullname) + 1);
-                       readcmdfile(fullname);
-                       cmdp = cmdlookup(name, 0);
-                       if (cmdp == NULL || cmdp->cmdtype != CMDFUNCTION)
-                               ash_msg_and_raise_error("%s not defined in %s", name, fullname);
-                       stunalloc(fullname);
-                       goto success;
-               }
-               TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
-               if (!updatetbl) {
-                       entry->cmdtype = CMDNORMAL;
-                       entry->u.index = idx;
-                       return;
-               }
-               INT_OFF;
-               cmdp = cmdlookup(name, 1);
-               cmdp->cmdtype = CMDNORMAL;
-               cmdp->param.index = idx;
-               INT_ON;
-               goto success;
+       /*
+        * If the file exists and is a regular file, return an error
+        * immediately.
+        */
+       r = stat(fname, &finfo);
+       if (r == 0 && S_ISREG(finfo.st_mode)) {
+               errno = EEXIST;
+               return -1;
        }
 
-       /* We failed.  If there was an entry for this command, delete it */
-       if (cmdp && updatetbl)
-               delete_cmd_entry();
-       if (act & DO_ERR)
-               ash_msg("%s: %s", name, errmsg(e, "not found"));
-       entry->cmdtype = CMDUNKNOWN;
-       return;
+       /*
+        * If the file was not present (r != 0), make sure we open it
+        * exclusively so that if it is created before we open it, our open
+        * will fail.  Make sure that we do not truncate an existing file.
+        * Note that we don't turn on O_EXCL unless the stat failed -- if the
+        * file was not a regular file, we leave O_EXCL off.
+        */
+       if (r != 0)
+               return open(fname, O_WRONLY|O_CREAT|O_EXCL, 0666);
+       fd = open(fname, O_WRONLY|O_CREAT, 0666);
 
- builtin_success:
-       if (!updatetbl) {
-               entry->cmdtype = CMDBUILTIN;
-               entry->u.cmd = bcmd;
-               return;
-       }
-       INT_OFF;
-       cmdp = cmdlookup(name, 1);
-       cmdp->cmdtype = CMDBUILTIN;
-       cmdp->param.cmd = bcmd;
-       INT_ON;
- success:
-       cmdp->rehash = 0;
-       entry->cmdtype = cmdp->cmdtype;
-       entry->u = cmdp->param;
-}
+       /* If the open failed, return the file descriptor right away. */
+       if (fd < 0)
+               return fd;
 
+       /*
+        * OK, the open succeeded, but the file may have been changed from a
+        * non-regular file to a regular file between the stat and the open.
+        * We are assuming that the O_EXCL open handles the case where FILENAME
+        * did not exist and is symlinked to an existing file between the stat
+        * and open.
+        */
 
-/*
- * Search the table of builtin commands.
- */
-static struct builtincmd *
-find_builtin(const char *name)
-{
-       struct builtincmd *bp;
+       /*
+        * If we can open it and fstat the file descriptor, and neither check
+        * revealed that it was a regular file, and the file has not been
+        * replaced, return the file descriptor.
+        */
+       if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode)
+        && finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
+               return fd;
 
-       bp = bsearch(
-               name, builtincmd, NUMBUILTINS, sizeof(struct builtincmd),
-               pstrcmp
-       );
-       return bp;
+       /* The file has been replaced.  badness. */
+       close(fd);
+       errno = EEXIST;
+       return -1;
 }
 
-
 /*
- * Called when a cd is done.  Marks all commands so the next time they
- * are executed they will be rehashed.
+ * Handle here documents.  Normally we fork off a process to write the
+ * data to a pipe.  If the document is short, we can stuff the data in
+ * the pipe without forking.
  */
-static void
-hashcd(void)
+/* openhere needs this forward reference */
+static void expandhere(union node *arg, int fd);
+static int
+openhere(union node *redir)
 {
-       struct tblentry **pp;
-       struct tblentry *cmdp;
+       int pip[2];
+       size_t len = 0;
 
-       for (pp = cmdtable; pp < &cmdtable[CMDTABLESIZE]; pp++) {
-               for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
-                       if (cmdp->cmdtype == CMDNORMAL || (
-                               cmdp->cmdtype == CMDBUILTIN &&
-                               !(IS_BUILTIN_REGULAR(cmdp->param.cmd)) &&
-                               builtinloc > 0
-                       ))
-                               cmdp->rehash = 1;
+       if (pipe(pip) < 0)
+               ash_msg_and_raise_error("pipe call failed");
+       if (redir->type == NHERE) {
+               len = strlen(redir->nhere.doc->narg.text);
+               if (len <= PIPESIZE) {
+                       full_write(pip[1], redir->nhere.doc->narg.text, len);
+                       goto out;
                }
        }
+       if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
+               close(pip[0]);
+               signal(SIGINT, SIG_IGN);
+               signal(SIGQUIT, SIG_IGN);
+               signal(SIGHUP, SIG_IGN);
+#ifdef SIGTSTP
+               signal(SIGTSTP, SIG_IGN);
+#endif
+               signal(SIGPIPE, SIG_DFL);
+               if (redir->type == NHERE)
+                       full_write(pip[1], redir->nhere.doc->narg.text, len);
+               else
+                       expandhere(redir->nhere.doc, pip[1]);
+               _exit(0);
+       }
+ out:
+       close(pip[1]);
+       return pip[0];
 }
 
-
-/*
- * Fix command hash table when PATH changed.
- * Called before PATH is changed.  The argument is the new value of PATH;
- * pathval() still returns the old value at this point.
- * Called with interrupts off.
- */
-static void
-changepath(const char *newval)
+static int
+openredirect(union node *redir)
 {
-       const char *old, *new;
-       int idx;
-       int firstchange;
-       int idx_bltin;
+       char *fname;
+       int f;
 
-       old = pathval();
-       new = newval;
-       firstchange = 9999;     /* assume no change */
-       idx = 0;
-       idx_bltin = -1;
-       for (;;) {
-               if (*old != *new) {
-                       firstchange = idx;
-                       if ((*old == '\0' && *new == ':')
-                        || (*old == ':' && *new == '\0'))
-                               firstchange++;
-                       old = new;      /* ignore subsequent differences */
-               }
-               if (*new == '\0')
+       switch (redir->nfile.type) {
+       case NFROM:
+               fname = redir->nfile.expfname;
+               f = open(fname, O_RDONLY);
+               if (f < 0)
+                       goto eopen;
+               break;
+       case NFROMTO:
+               fname = redir->nfile.expfname;
+               f = open(fname, O_RDWR|O_CREAT|O_TRUNC, 0666);
+               if (f < 0)
+                       goto ecreate;
+               break;
+       case NTO:
+               /* Take care of noclobber mode. */
+               if (Cflag) {
+                       fname = redir->nfile.expfname;
+                       f = noclobberopen(fname);
+                       if (f < 0)
+                               goto ecreate;
                        break;
-               if (*new == '%' && idx_bltin < 0 && prefix(new + 1, "builtin"))
-                       idx_bltin = idx;
-               if (*new == ':') {
-                       idx++;
                }
-               new++, old++;
+               /* FALLTHROUGH */
+       case NCLOBBER:
+               fname = redir->nfile.expfname;
+               f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+               if (f < 0)
+                       goto ecreate;
+               break;
+       case NAPPEND:
+               fname = redir->nfile.expfname;
+               f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666);
+               if (f < 0)
+                       goto ecreate;
+               break;
+       default:
+#if DEBUG
+               abort();
+#endif
+               /* Fall through to eliminate warning. */
+       case NTOFD:
+       case NFROMFD:
+               f = -1;
+               break;
+       case NHERE:
+       case NXHERE:
+               f = openhere(redir);
+               break;
        }
-       if (builtinloc < 0 && idx_bltin >= 0)
-               builtinloc = idx_bltin;             /* zap builtins */
-       if (builtinloc >= 0 && idx_bltin < 0)
-               firstchange = 0;
-       clearcmdentry(firstchange);
-       builtinloc = idx_bltin;
-}
-
-
-/*
- * Clear out command entries.  The argument specifies the first entry in
- * PATH which has changed.
- */
-static void
-clearcmdentry(int firstchange)
-{
-       struct tblentry **tblp;
-       struct tblentry **pp;
-       struct tblentry *cmdp;
 
-       INT_OFF;
-       for (tblp = cmdtable; tblp < &cmdtable[CMDTABLESIZE]; tblp++) {
-               pp = tblp;
-               while ((cmdp = *pp) != NULL) {
-                       if ((cmdp->cmdtype == CMDNORMAL &&
-                            cmdp->param.index >= firstchange)
-                        || (cmdp->cmdtype == CMDBUILTIN &&
-                            builtinloc >= firstchange)
-                       ) {
-                               *pp = cmdp->next;
-                               free(cmdp);
-                       } else {
-                               pp = &cmdp->next;
-                       }
-               }
-       }
-       INT_ON;
+       return f;
+ ecreate:
+       ash_msg_and_raise_error("cannot create %s: %s", fname, errmsg(errno, "nonexistent directory"));
+ eopen:
+       ash_msg_and_raise_error("cannot open %s: %s", fname, errmsg(errno, "no such file"));
 }
 
-
 /*
- * Locate a command in the command hash table.  If "add" is nonzero,
- * add the command to the table if it is not already present.  The
- * variable "lastcmdentry" is set to point to the address of the link
- * pointing to the entry, so that delete_cmd_entry can delete the
- * entry.
- *
- * Interrupts must be off if called with add != 0.
+ * Copy a file descriptor to be >= to.  Returns -1
+ * if the source file descriptor is closed, EMPTY if there are no unused
+ * file descriptors left.
  */
-static struct tblentry **lastcmdentry;
-
-static struct tblentry *
-cmdlookup(const char *name, int add)
+static int
+copyfd(int from, int to)
 {
-       unsigned int hashval;
-       const char *p;
-       struct tblentry *cmdp;
-       struct tblentry **pp;
+       int newfd;
 
-       p = name;
-       hashval = (unsigned char)*p << 4;
-       while (*p)
-               hashval += (unsigned char)*p++;
-       hashval &= 0x7FFF;
-       pp = &cmdtable[hashval % CMDTABLESIZE];
-       for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
-               if (strcmp(cmdp->cmdname, name) == 0)
-                       break;
-               pp = &cmdp->next;
-       }
-       if (add && cmdp == NULL) {
-               cmdp = *pp = ckmalloc(sizeof(struct tblentry) - ARB
-                                       + strlen(name) + 1);
-               cmdp->next = NULL;
-               cmdp->cmdtype = CMDUNKNOWN;
-               strcpy(cmdp->cmdname, name);
+       newfd = fcntl(from, F_DUPFD, to);
+       if (newfd < 0) {
+               if (errno == EMFILE)
+                       return EMPTY;
+               ash_msg_and_raise_error("%d: %m", from);
        }
-       lastcmdentry = pp;
-       return cmdp;
+       return newfd;
 }
 
-
-/*
- * Delete the command entry returned on the last lookup.
- */
 static void
-delete_cmd_entry(void)
+dupredirect(union node *redir, int f)
 {
-       struct tblentry *cmdp;
-
-       INT_OFF;
-       cmdp = *lastcmdentry;
-       *lastcmdentry = cmdp->next;
-       if (cmdp->cmdtype == CMDFUNCTION)
-               freefunc(cmdp->param.func);
-       free(cmdp);
-       INT_ON;
-}
-
+       int fd = redir->nfile.fd;
 
-/*
- * Add a new command entry, replacing any existing command entry for
- * the same name - except special builtins.
- */
-static void addcmdentry(char *name, struct cmdentry *entry)
-{
-       struct tblentry *cmdp;
+       if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
+               if (redir->ndup.dupfd >= 0) {   /* if not ">&-" */
+                       copyfd(redir->ndup.dupfd, fd);
+               }
+               return;
+       }
 
-       cmdp = cmdlookup(name, 1);
-       if (cmdp->cmdtype == CMDFUNCTION) {
-               freefunc(cmdp->param.func);
+       if (f != fd) {
+               copyfd(f, fd);
+               close(f);
        }
-       cmdp->cmdtype = entry->cmdtype;
-       cmdp->param = entry->u;
-       cmdp->rehash = 0;
 }
 
-
 /*
- * Make a copy of a parse tree.
+ * Process a list of redirection commands.  If the REDIR_PUSH flag is set,
+ * old file descriptors are stashed away so that the redirection can be
+ * undone by calling popredir.  If the REDIR_BACKQ flag is set, then the
+ * standard output, and the standard error if it becomes a duplicate of
+ * stdout, is saved in memory.
  */
-static struct funcnode * copyfunc(union node *n)
+/* flags passed to redirect */
+#define REDIR_PUSH    01        /* save previous values of file descriptors */
+#define REDIR_SAVEFD2 03        /* set preverrout */
+static void
+redirect(union node *redir, int flags)
 {
-       struct funcnode *f;
-       size_t blocksize;
-
-       funcblocksize = offsetof(struct funcnode, n);
-       funcstringsize = 0;
-       calcsize(n);
-       blocksize = funcblocksize;
-       f = ckmalloc(blocksize + funcstringsize);
-       funcblock = (char *) f + offsetof(struct funcnode, n);
-       funcstring = (char *) f + blocksize;
-       copynode(n);
-       f->count = 0;
-       return f;
-}
+       union node *n;
+       struct redirtab *sv;
+       int i;
+       int fd;
+       int newfd;
+       int *p;
+       nullredirs++;
+       if (!redir) {
+               return;
+       }
+       sv = NULL;
+       INT_OFF;
+       if (flags & REDIR_PUSH) {
+               struct redirtab *q;
+               q = ckmalloc(sizeof(struct redirtab));
+               q->next = redirlist;
+               redirlist = q;
+               q->nullredirs = nullredirs - 1;
+               for (i = 0; i < 10; i++)
+                       q->renamed[i] = EMPTY;
+               nullredirs = 0;
+               sv = q;
+       }
+       n = redir;
+       do {
+               fd = n->nfile.fd;
+               if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD)
+                && n->ndup.dupfd == fd)
+                       continue; /* redirect from/to same file descriptor */
 
+               newfd = openredirect(n);
+               if (fd == newfd)
+                       continue;
+               if (sv && *(p = &sv->renamed[fd]) == EMPTY) {
+                       i = fcntl(fd, F_DUPFD, 10);
+
+                       if (i == -1) {
+                               i = errno;
+                               if (i != EBADF) {
+                                       close(newfd);
+                                       errno = i;
+                                       ash_msg_and_raise_error("%d: %m", fd);
+                                       /* NOTREACHED */
+                               }
+                       } else {
+                               *p = i;
+                               close(fd);
+                       }
+               } else {
+                       close(fd);
+               }
+               dupredirect(n, newfd);
+       } while ((n = n->nfile.next));
+       INT_ON;
+       if (flags & REDIR_SAVEFD2 && sv && sv->renamed[2] >= 0)
+               preverrout_fd = sv->renamed[2];
+}
 
 /*
- * Define a shell function.
+ * Undo the effects of the last redirection.
  */
 static void
-defun(char *name, union node *func)
+popredir(int drop)
 {
-       struct cmdentry entry;
+       struct redirtab *rp;
+       int i;
 
+       if (--nullredirs >= 0)
+               return;
        INT_OFF;
-       entry.cmdtype = CMDFUNCTION;
-       entry.u.func = copyfunc(func);
-       addcmdentry(name, &entry);
+       rp = redirlist;
+       for (i = 0; i < 10; i++) {
+               if (rp->renamed[i] != EMPTY) {
+                       if (!drop) {
+                               close(i);
+                               copyfd(rp->renamed[i], i);
+                       }
+                       close(rp->renamed[i]);
+               }
+       }
+       redirlist = rp->next;
+       nullredirs = rp->nullredirs;
+       free(rp);
        INT_ON;
 }
 
+/*
+ * Undo all redirections.  Called on error or interrupt.
+ */
 
 /*
- * Delete a function if it exists.
+ * Discard all saved file descriptors.
  */
 static void
-unsetfunc(const char *name)
+clearredir(int drop)
 {
-       struct tblentry *cmdp;
+       for (;;) {
+               nullredirs = 0;
+               if (!redirlist)
+                       break;
+               popredir(drop);
+       }
+}
 
-       cmdp = cmdlookup(name, 0);
-       if (cmdp!= NULL && cmdp->cmdtype == CMDFUNCTION)
-               delete_cmd_entry();
+static int
+redirectsafe(union node *redir, int flags)
+{
+       int err;
+       volatile int saveint;
+       struct jmploc *volatile savehandler = exception_handler;
+       struct jmploc jmploc;
+
+       SAVE_INT(saveint);
+       err = setjmp(jmploc.loc) * 2;
+       if (!err) {
+               exception_handler = &jmploc;
+               redirect(redir, flags);
+       }
+       exception_handler = savehandler;
+       if (err && exception != EXERROR)
+               longjmp(exception_handler->loc, 1);
+       RESTORE_INT(saveint);
+       return err;
 }
 
+
+/* ============ Routines to expand arguments to commands
+ *
+ * We have to deal with backquotes, shell variables, and file metacharacters.
+ */
+
 /*
- * Locate and print what a word is...
+ * expandarg flags
+ */
+#define EXP_FULL        0x1     /* perform word splitting & file globbing */
+#define EXP_TILDE       0x2     /* do normal tilde expansion */
+#define EXP_VARTILDE    0x4     /* expand tildes in an assignment */
+#define EXP_REDIR       0x8     /* file glob for a redirection (1 match only) */
+#define EXP_CASE        0x10    /* keeps quotes around for CASE pattern */
+#define EXP_RECORD      0x20    /* need to record arguments for ifs breakup */
+#define EXP_VARTILDE2   0x40    /* expand tildes after colons only */
+#define EXP_WORD        0x80    /* expand word in parameter expansion */
+#define EXP_QWORD       0x100   /* expand word in quoted parameter expansion */
+/*
+ * _rmescape() flags
+ */
+#define RMESCAPE_ALLOC  0x1     /* Allocate a new string */
+#define RMESCAPE_GLOB   0x2     /* Add backslashes for glob */
+#define RMESCAPE_QUOTED 0x4     /* Remove CTLESC unless in quotes */
+#define RMESCAPE_GROW   0x8     /* Grow strings instead of stalloc */
+#define RMESCAPE_HEAP   0x10    /* Malloc strings instead of stalloc */
+
+/*
+ * Structure specifying which parts of the string should be searched
+ * for IFS characters.
+ */
+struct ifsregion {
+       struct ifsregion *next; /* next region in list */
+       int begoff;             /* offset of start of region */
+       int endoff;             /* offset of end of region */
+       int nulonly;            /* search for nul bytes only */
+};
+
+struct arglist {
+       struct strlist *list;
+       struct strlist **lastp;
+};
+
+/* output of current string */
+static char *expdest;
+/* list of back quote expressions */
+static struct nodelist *argbackq;
+/* first struct in list of ifs regions */
+static struct ifsregion ifsfirst;
+/* last struct in list */
+static struct ifsregion *ifslastp;
+/* holds expanded arg list */
+static struct arglist exparg;
+
+/*
+ * Our own itoa().
  */
-#if ENABLE_ASH_CMDCMD
 static int
-describe_command(char *command, int describe_command_verbose)
+cvtnum(arith_t num)
+{
+       int len;
+
+       expdest = makestrspace(32, expdest);
+#if ENABLE_ASH_MATH_SUPPORT_64
+       len = fmtstr(expdest, 32, "%lld", (long long) num);
 #else
-#define describe_command_verbose 1
-static int
-describe_command(char *command)
+       len = fmtstr(expdest, 32, "%ld", num);
 #endif
+       STADJUST(len, expdest);
+       return len;
+}
+
+static size_t
+esclen(const char *start, const char *p)
 {
-       struct cmdentry entry;
-       struct tblentry *cmdp;
-#if ENABLE_ASH_ALIAS
-       const struct alias *ap;
-#endif
-       const char *path = pathval();
+       size_t esc = 0;
 
-       if (describe_command_verbose) {
-               out1str(command);
+       while (p > start && *--p == CTLESC) {
+               esc++;
        }
+       return esc;
+}
 
-       /* First look at the keywords */
-       if (findkwd(command)) {
-               out1str(describe_command_verbose ? " is a shell keyword" : command);
-               goto out;
+/*
+ * Remove any CTLESC characters from a string.
+ */
+static char *
+_rmescapes(char *str, int flag)
+{
+       static const char qchars[] ALIGN1 = { CTLESC, CTLQUOTEMARK, '\0' };
+
+       char *p, *q, *r;
+       unsigned inquotes;
+       int notescaped;
+       int globbing;
+
+       p = strpbrk(str, qchars);
+       if (!p) {
+               return str;
        }
+       q = p;
+       r = str;
+       if (flag & RMESCAPE_ALLOC) {
+               size_t len = p - str;
+               size_t fulllen = len + strlen(p) + 1;
 
-#if ENABLE_ASH_ALIAS
-       /* Then look at the aliases */
-       ap = lookupalias(command, 0);
-       if (ap != NULL) {
-               if (describe_command_verbose) {
-                       out1fmt(" is an alias for %s", ap->val);
+               if (flag & RMESCAPE_GROW) {
+                       r = makestrspace(fulllen, expdest);
+               } else if (flag & RMESCAPE_HEAP) {
+                       r = ckmalloc(fulllen);
                } else {
-                       out1str("alias ");
-                       printalias(ap);
-                       return 0;
+                       r = stalloc(fulllen);
+               }
+               q = r;
+               if (len > 0) {
+                       q = memcpy(q, str, len) + len;
                }
-               goto out;
        }
-#endif
-       /* Then check if it is a tracked alias */
-       cmdp = cmdlookup(command, 0);
-       if (cmdp != NULL) {
-               entry.cmdtype = cmdp->cmdtype;
-               entry.u = cmdp->param;
-       } else {
-               /* Finally use brute force */
-               find_command(command, &entry, DO_ABS, path);
-       }
-
-       switch (entry.cmdtype) {
-       case CMDNORMAL: {
-               int j = entry.u.index;
-               char *p;
-               if (j == -1) {
-                       p = command;
-               } else {
-                       do {
-                               p = padvance(&path, command);
-                               stunalloc(p);
-                       } while (--j >= 0);
-               }
-               if (describe_command_verbose) {
-                       out1fmt(" is%s %s",
-                               (cmdp ? " a tracked alias for" : nullstr), p
-                       );
-               } else {
-                       out1str(p);
-               }
-               break;
-       }
-
-       case CMDFUNCTION:
-               if (describe_command_verbose) {
-                       out1str(" is a shell function");
-               } else {
-                       out1str(command);
+       inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
+       globbing = flag & RMESCAPE_GLOB;
+       notescaped = globbing;
+       while (*p) {
+               if (*p == CTLQUOTEMARK) {
+                       inquotes = ~inquotes;
+                       p++;
+                       notescaped = globbing;
+                       continue;
                }
-               break;
-
-       case CMDBUILTIN:
-               if (describe_command_verbose) {
-                       out1fmt(" is a %sshell builtin",
-                               IS_BUILTIN_SPECIAL(entry.u.cmd) ?
-                                       "special " : nullstr
-                       );
-               } else {
-                       out1str(command);
+               if (*p == '\\') {
+                       /* naked back slash */
+                       notescaped = 0;
+                       goto copy;
                }
-               break;
-
-       default:
-               if (describe_command_verbose) {
-                       out1str(": not found\n");
+               if (*p == CTLESC) {
+                       p++;
+                       if (notescaped && inquotes && *p != '/') {
+                               *q++ = '\\';
+                       }
                }
-               return 127;
+               notescaped = globbing;
+ copy:
+               *q++ = *p++;
        }
- out:
-       outstr("\n", stdout);
-       return 0;
-}
-
-static int
-typecmd(int argc, char **argv)
-{
-       int i;
-       int err = 0;
-
-       for (i = 1; i < argc; i++) {
-#if ENABLE_ASH_CMDCMD
-               err |= describe_command(argv[i], 1);
-#else
-               err |= describe_command(argv[i]);
-#endif
+       *q = '\0';
+       if (flag & RMESCAPE_GROW) {
+               expdest = r;
+               STADJUST(q - r + 1, expdest);
        }
-       return err;
-}
-
-#if ENABLE_ASH_CMDCMD
-static int
-commandcmd(int argc, char **argv)
-{
-       int c;
-       enum {
-               VERIFY_BRIEF = 1,
-               VERIFY_VERBOSE = 2,
-       } verify = 0;
-
-       while ((c = nextopt("pvV")) != '\0')
-               if (c == 'V')
-                       verify |= VERIFY_VERBOSE;
-               else if (c == 'v')
-                       verify |= VERIFY_BRIEF;
-#if DEBUG
-               else if (c != 'p')
-                       abort();
-#endif
-       if (verify)
-               return describe_command(*argptr, verify - VERIFY_BRIEF);
-
-       return 0;
+       return r;
 }
-#endif
-
-/*      expand.c     */
-
-/*
- * Routines to expand arguments to commands.  We have to deal with
- * backquotes, shell variables, and file metacharacters.
- */
-
-/*
- * _rmescape() flags
- */
-#define RMESCAPE_ALLOC  0x1     /* Allocate a new string */
-#define RMESCAPE_GLOB   0x2     /* Add backslashes for glob */
-#define RMESCAPE_QUOTED 0x4     /* Remove CTLESC unless in quotes */
-#define RMESCAPE_GROW   0x8     /* Grow strings instead of stalloc */
-#define RMESCAPE_HEAP   0x10    /* Malloc strings instead of stalloc */
-
-/*
- * Structure specifying which parts of the string should be searched
- * for IFS characters.
- */
-
-struct ifsregion {
-       struct ifsregion *next; /* next region in list */
-       int begoff;             /* offset of start of region */
-       int endoff;             /* offset of end of region */
-       int nulonly;            /* search for nul bytes only */
-};
-
-/* output of current string */
-static char *expdest;
-/* list of back quote expressions */
-static struct nodelist *argbackq;
-/* first struct in list of ifs regions */
-static struct ifsregion ifsfirst;
-/* last struct in list */
-static struct ifsregion *ifslastp;
-/* holds expanded arg list */
-static struct arglist exparg;
-
-static void argstr(char *, int);
-static char *exptilde(char *, char *, int);
-static void expbackq(union node *, int, int);
-static const char *subevalvar(char *, char *, int, int, int, int, int);
-static char *evalvar(char *, int);
-static void strtodest(const char *, int, int);
-static void memtodest(const char *p, size_t len, int syntax, int quotes);
-static ssize_t varvalue(char *, int, int);
-static void recordregion(int, int, int);
-static void removerecordregions(int);
-static void ifsbreakup(char *, struct arglist *);
-static void ifsfree(void);
-static void expandmeta(struct strlist *, int);
-static int patmatch(char *, const char *);
-
-static int cvtnum(arith_t);
-static size_t esclen(const char *, const char *);
-static char *scanleft(char *, char *, char *, char *, int, int);
-static char *scanright(char *, char *, char *, char *, int, int);
-static void varunset(const char *, const char *, const char *, int) ATTRIBUTE_NORETURN;
-
+#define rmescapes(p) _rmescapes((p), 0)
 
 #define pmatch(a, b) !fnmatch((a), (b), 0)
+
 /*
  * Prepare a pattern for a expmeta (internal glob(3)) call.
  *
  * Returns an stalloced string.
  */
-
-static char * preglob(const char *pattern, int quoted, int flag)
+static char *
+preglob(const char *pattern, int quoted, int flag)
 {
        flag |= RMESCAPE_GLOB;
        if (quoted) {
@@ -5408,223 +5080,95 @@ static char * preglob(const char *pattern, int quoted, int flag)
        return _rmescapes((char *)pattern, flag);
 }
 
-
-static size_t
-esclen(const char *start, const char *p)
+/*
+ * Put a string on the stack.
+ */
+static void
+memtodest(const char *p, size_t len, int syntax, int quotes)
 {
-       size_t esc = 0;
+       char *q = expdest;
 
-       while (p > start && *--p == CTLESC) {
-               esc++;
-       }
-       return esc;
-}
+       q = makestrspace(len * 2, q);
 
+       while (len--) {
+               int c = signed_char2int(*p++);
+               if (!c)
+                       continue;
+               if (quotes && (SIT(c, syntax) == CCTL || SIT(c, syntax) == CBACK))
+                       USTPUTC(CTLESC, q);
+               USTPUTC(c, q);
+       }
 
-/*
- * Expand shell variables and backquotes inside a here document.
- */
+       expdest = q;
+}
 
-static void expandhere(union node *arg, int fd)
+static void
+strtodest(const char *p, int syntax, int quotes)
 {
-       herefd = fd;
-       expandarg(arg, (struct arglist *)NULL, 0);
-       full_write(fd, stackblock(), expdest - (char *)stackblock());
+       memtodest(p, strlen(p), syntax, quotes);
 }
 
-
 /*
- * Perform variable substitution and command substitution on an argument,
- * placing the resulting list of arguments in arglist.  If EXP_FULL is true,
- * perform splitting and file name expansion.  When arglist is NULL, perform
- * here document expansion.
+ * Record the fact that we have to scan this region of the
+ * string for IFS characters.
  */
 static void
-expandarg(union node *arg, struct arglist *arglist, int flag)
+recordregion(int start, int end, int nulonly)
 {
-       struct strlist *sp;
-       char *p;
+       struct ifsregion *ifsp;
 
-       argbackq = arg->narg.backquote;
-       STARTSTACKSTR(expdest);
-       ifsfirst.next = NULL;
-       ifslastp = NULL;
-       argstr(arg->narg.text, flag);
-       p = _STPUTC('\0', expdest);
-       expdest = p - 1;
-       if (arglist == NULL) {
-               return;                 /* here document expanded */
-       }
-       p = grabstackstr(p);
-       exparg.lastp = &exparg.list;
-       /*
-        * TODO - EXP_REDIR
-        */
-       if (flag & EXP_FULL) {
-               ifsbreakup(p, &exparg);
-               *exparg.lastp = NULL;
-               exparg.lastp = &exparg.list;
-               expandmeta(exparg.list, flag);
+       if (ifslastp == NULL) {
+               ifsp = &ifsfirst;
        } else {
-               if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
-                       rmescapes(p);
-               sp = stalloc(sizeof(*sp));
-               sp->text = p;
-               *exparg.lastp = sp;
-               exparg.lastp = &sp->next;
-       }
-       if (ifsfirst.next)
-               ifsfree();
-       *exparg.lastp = NULL;
-       if (exparg.list) {
-               *arglist->lastp = exparg.list;
-               arglist->lastp = exparg.lastp;
+               INT_OFF;
+               ifsp = ckmalloc(sizeof(*ifsp));
+               ifsp->next = NULL;
+               ifslastp->next = ifsp;
+               INT_ON;
        }
+       ifslastp = ifsp;
+       ifslastp->begoff = start;
+       ifslastp->endoff = end;
+       ifslastp->nulonly = nulonly;
 }
 
-
-/*
- * Perform variable and command substitution.  If EXP_FULL is set, output CTLESC
- * characters to allow for further processing.  Otherwise treat
- * $@ like $* since no splitting will be performed.
- */
 static void
-argstr(char *p, int flag)
+removerecordregions(int endoff)
 {
-       static const char spclchars[] = {
-               '=',
-               ':',
-               CTLQUOTEMARK,
-               CTLENDVAR,
-               CTLESC,
-               CTLVAR,
-               CTLBACKQ,
-               CTLBACKQ | CTLQUOTE,
-#if ENABLE_ASH_MATH_SUPPORT
-               CTLENDARI,
-#endif
-               0
-       };
-       const char *reject = spclchars;
-       int c;
-       int quotes = flag & (EXP_FULL | EXP_CASE);      /* do CTLESC */
-       int breakall = flag & EXP_WORD;
-       int inquotes;
-       size_t length;
-       int startloc;
-
-       if (!(flag & EXP_VARTILDE)) {
-               reject += 2;
-       } else if (flag & EXP_VARTILDE2) {
-               reject++;
-       }
-       inquotes = 0;
-       length = 0;
-       if (flag & EXP_TILDE) {
-               char *q;
+       if (ifslastp == NULL)
+               return;
 
-               flag &= ~EXP_TILDE;
- tilde:
-               q = p;
-               if (*q == CTLESC && (flag & EXP_QWORD))
-                       q++;
-               if (*q == '~')
-                       p = exptilde(p, q, flag);
-       }
- start:
-       startloc = expdest - (char *)stackblock();
-       for (;;) {
-               length += strcspn(p + length, reject);
-               c = p[length];
-               if (c && (!(c & 0x80)
-#if ENABLE_ASH_MATH_SUPPORT
-                                       || c == CTLENDARI
-#endif
-                  )) {
-                       /* c == '=' || c == ':' || c == CTLENDARI */
-                       length++;
-               }
-               if (length > 0) {
-                       int newloc;
-                       expdest = stack_nputstr(p, length, expdest);
-                       newloc = expdest - (char *)stackblock();
-                       if (breakall && !inquotes && newloc > startloc) {
-                               recordregion(startloc, newloc, 0);
-                       }
-                       startloc = newloc;
+       if (ifsfirst.endoff > endoff) {
+               while (ifsfirst.next != NULL) {
+                       struct ifsregion *ifsp;
+                       INT_OFF;
+                       ifsp = ifsfirst.next->next;
+                       free(ifsfirst.next);
+                       ifsfirst.next = ifsp;
+                       INT_ON;
                }
-               p += length + 1;
-               length = 0;
-
-               switch (c) {
-               case '\0':
-                       goto breakloop;
-               case '=':
-                       if (flag & EXP_VARTILDE2) {
-                               p--;
-                               continue;
-                       }
-                       flag |= EXP_VARTILDE2;
-                       reject++;
-                       /* fall through */
-               case ':':
-                       /*
-                        * sort of a hack - expand tildes in variable
-                        * assignments (after the first '=' and after ':'s).
-                        */
-                       if (*--p == '~') {
-                               goto tilde;
-                       }
-                       continue;
+               if (ifsfirst.begoff > endoff)
+                       ifslastp = NULL;
+               else {
+                       ifslastp = &ifsfirst;
+                       ifsfirst.endoff = endoff;
                }
+               return;
+       }
 
-               switch (c) {
-               case CTLENDVAR: /* ??? */
-                       goto breakloop;
-               case CTLQUOTEMARK:
-                       /* "$@" syntax adherence hack */
-                       if (
-                               !inquotes &&
-                               !memcmp(p, dolatstr, 4) &&
-                               (p[4] == CTLQUOTEMARK || (
-                                       p[4] == CTLENDVAR &&
-                                       p[5] == CTLQUOTEMARK
-                               ))
-                       ) {
-                               p = evalvar(p + 1, flag) + 1;
-                               goto start;
-                       }
-                       inquotes = !inquotes;
- addquote:
-                       if (quotes) {
-                               p--;
-                               length++;
-                               startloc++;
-                       }
-                       break;
-               case CTLESC:
-                       startloc++;
-                       length++;
-                       goto addquote;
-               case CTLVAR:
-                       p = evalvar(p, flag);
-                       goto start;
-               case CTLBACKQ:
-                       c = 0;
-               case CTLBACKQ|CTLQUOTE:
-                       expbackq(argbackq->n, c, quotes);
-                       argbackq = argbackq->next;
-                       goto start;
-#if ENABLE_ASH_MATH_SUPPORT
-               case CTLENDARI:
-                       p--;
-                       expari(quotes);
-                       goto start;
-#endif
-               }
+       ifslastp = &ifsfirst;
+       while (ifslastp->next && ifslastp->next->begoff < endoff)
+               ifslastp=ifslastp->next;
+       while (ifslastp->next != NULL) {
+               struct ifsregion *ifsp;
+               INT_OFF;
+               ifsp = ifslastp->next->next;
+               free(ifslastp->next);
+               ifslastp->next = ifsp;
+               INT_ON;
        }
- breakloop:
-       ;
+       if (ifslastp->endoff > endoff)
+               ifslastp->endoff = endoff;
 }
 
 static char *
@@ -5676,62 +5220,144 @@ exptilde(char *startp, char *p, int flag)
        return startp;
 }
 
+/*
+ * Execute a command inside back quotes.  If it's a builtin command, we
+ * want to save its output in a block obtained from malloc.  Otherwise
+ * we fork off a subprocess and get the output of the command via a pipe.
+ * Should be called with interrupts off.
+ */
+struct backcmd {                /* result of evalbackcmd */
+       int fd;                 /* file descriptor to read from */
+       char *buf;              /* buffer */
+       int nleft;              /* number of chars in buffer */
+       struct job *jp;         /* job structure for command */
+};
+
+/* These forward decls are needed to use "eval" code for backticks handling: */
+static int back_exitstatus; /* exit status of backquoted command */
+#define EV_EXIT 01              /* exit after evaluating tree */
+static void evaltree(union node *, int);
 
 static void
-removerecordregions(int endoff)
+evalbackcmd(union node *n, struct backcmd *result)
 {
-       if (ifslastp == NULL)
-               return;
+       int saveherefd;
 
-       if (ifsfirst.endoff > endoff) {
-               while (ifsfirst.next != NULL) {
-                       struct ifsregion *ifsp;
-                       INT_OFF;
-                       ifsp = ifsfirst.next->next;
-                       free(ifsfirst.next);
-                       ifsfirst.next = ifsp;
-                       INT_ON;
-               }
-               if (ifsfirst.begoff > endoff)
-                       ifslastp = NULL;
-               else {
-                       ifslastp = &ifsfirst;
-                       ifsfirst.endoff = endoff;
-               }
-               return;
+       result->fd = -1;
+       result->buf = NULL;
+       result->nleft = 0;
+       result->jp = NULL;
+       if (n == NULL) {
+               goto out;
        }
 
-       ifslastp = &ifsfirst;
-       while (ifslastp->next && ifslastp->next->begoff < endoff)
-               ifslastp=ifslastp->next;
-       while (ifslastp->next != NULL) {
-               struct ifsregion *ifsp;
-               INT_OFF;
-               ifsp = ifslastp->next->next;
-               free(ifslastp->next);
-               ifslastp->next = ifsp;
-               INT_ON;
+       saveherefd = herefd;
+       herefd = -1;
+
+       {
+               int pip[2];
+               struct job *jp;
+
+               if (pipe(pip) < 0)
+                       ash_msg_and_raise_error("pipe call failed");
+               jp = makejob(n, 1);
+               if (forkshell(jp, n, FORK_NOJOB) == 0) {
+                       FORCE_INT_ON;
+                       close(pip[0]);
+                       if (pip[1] != 1) {
+                               close(1);
+                               copyfd(pip[1], 1);
+                               close(pip[1]);
+                       }
+                       eflag = 0;
+                       evaltree(n, EV_EXIT); /* actually evaltreenr... */
+                       /* NOTREACHED */
+               }
+               close(pip[1]);
+               result->fd = pip[0];
+               result->jp = jp;
        }
-       if (ifslastp->endoff > endoff)
-               ifslastp->endoff = endoff;
+       herefd = saveherefd;
+ out:
+       TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
+               result->fd, result->buf, result->nleft, result->jp));
 }
 
-
-#if ENABLE_ASH_MATH_SUPPORT
 /*
- * Expand arithmetic expression.  Backup to start of expression,
- * evaluate, place result in (backed up) result, adjust string position.
+ * Expand stuff in backwards quotes.
  */
-void
-expari(int quotes)
+static void
+expbackq(union node *cmd, int quoted, int quotes)
 {
-       char *p, *start;
-       int begoff;
-       int flag;
-       int len;
-
-       /*      ifsfree(); */
-
+       struct backcmd in;
+       int i;
+       char buf[128];
+       char *p;
+       char *dest;
+       int startloc;
+       int syntax = quoted? DQSYNTAX : BASESYNTAX;
+       struct stackmark smark;
+
+       INT_OFF;
+       setstackmark(&smark);
+       dest = expdest;
+       startloc = dest - (char *)stackblock();
+       grabstackstr(dest);
+       evalbackcmd(cmd, &in);
+       popstackmark(&smark);
+
+       p = in.buf;
+       i = in.nleft;
+       if (i == 0)
+               goto read;
+       for (;;) {
+               memtodest(p, i, syntax, quotes);
+ read:
+               if (in.fd < 0)
+                       break;
+               i = safe_read(in.fd, buf, sizeof(buf));
+               TRACE(("expbackq: read returns %d\n", i));
+               if (i <= 0)
+                       break;
+               p = buf;
+       }
+
+       free(in.buf);
+       if (in.fd >= 0) {
+               close(in.fd);
+               back_exitstatus = waitforjob(in.jp);
+       }
+       INT_ON;
+
+       /* Eat all trailing newlines */
+       dest = expdest;
+       for (; dest > (char *)stackblock() && dest[-1] == '\n';)
+               STUNPUTC(dest);
+       expdest = dest;
+
+       if (quoted == 0)
+               recordregion(startloc, dest - (char *)stackblock(), 0);
+       TRACE(("evalbackq: size=%d: \"%.*s\"\n",
+               (dest - (char *)stackblock()) - startloc,
+               (dest - (char *)stackblock()) - startloc,
+               stackblock() + startloc));
+}
+
+#if ENABLE_ASH_MATH_SUPPORT
+/*
+ * Expand arithmetic expression.  Backup to start of expression,
+ * evaluate, place result in (backed up) result, adjust string position.
+ */
+static void
+expari(int quotes)
+{
+       char *p, *start;
+       int begoff;
+       int flag;
+       int len;
+
+       /*      ifsfree(); */
+
        /*
         * This routine is slightly over-complicated for
         * efficiency.  Next we scan backwards looking for the
@@ -5779,69 +5405,153 @@ expari(int quotes)
 }
 #endif
 
+/* argstr needs it */
+static char *evalvar(char *p, int flag);
 
 /*
- * Expand stuff in backwards quotes.
+ * Perform variable and command substitution.  If EXP_FULL is set, output CTLESC
+ * characters to allow for further processing.  Otherwise treat
+ * $@ like $* since no splitting will be performed.
  */
 static void
-expbackq(union node *cmd, int quoted, int quotes)
+argstr(char *p, int flag)
 {
-       struct backcmd in;
-       int i;
-       char buf[128];
-       char *p;
-       char *dest;
+       static const char spclchars[] ALIGN1 = {
+               '=',
+               ':',
+               CTLQUOTEMARK,
+               CTLENDVAR,
+               CTLESC,
+               CTLVAR,
+               CTLBACKQ,
+               CTLBACKQ | CTLQUOTE,
+#if ENABLE_ASH_MATH_SUPPORT
+               CTLENDARI,
+#endif
+               0
+       };
+       const char *reject = spclchars;
+       int c;
+       int quotes = flag & (EXP_FULL | EXP_CASE);      /* do CTLESC */
+       int breakall = flag & EXP_WORD;
+       int inquotes;
+       size_t length;
        int startloc;
-       int syntax = quoted? DQSYNTAX : BASESYNTAX;
-       struct stackmark smark;
-
-       INT_OFF;
-       setstackmark(&smark);
-       dest = expdest;
-       startloc = dest - (char *)stackblock();
-       grabstackstr(dest);
-       evalbackcmd(cmd, (struct backcmd *) &in);
-       popstackmark(&smark);
 
-       p = in.buf;
-       i = in.nleft;
-       if (i == 0)
-               goto read;
-       for (;;) {
-               memtodest(p, i, syntax, quotes);
- read:
-               if (in.fd < 0)
-                       break;
-               i = safe_read(in.fd, buf, sizeof(buf));
-               TRACE(("expbackq: read returns %d\n", i));
-               if (i <= 0)
-                       break;
-               p = buf;
+       if (!(flag & EXP_VARTILDE)) {
+               reject += 2;
+       } else if (flag & EXP_VARTILDE2) {
+               reject++;
        }
+       inquotes = 0;
+       length = 0;
+       if (flag & EXP_TILDE) {
+               char *q;
 
-       if (in.buf)
-               free(in.buf);
-       if (in.fd >= 0) {
-               close(in.fd);
-               back_exitstatus = waitforjob(in.jp);
+               flag &= ~EXP_TILDE;
+ tilde:
+               q = p;
+               if (*q == CTLESC && (flag & EXP_QWORD))
+                       q++;
+               if (*q == '~')
+                       p = exptilde(p, q, flag);
        }
-       INT_ON;
+ start:
+       startloc = expdest - (char *)stackblock();
+       for (;;) {
+               length += strcspn(p + length, reject);
+               c = p[length];
+               if (c && (!(c & 0x80)
+#if ENABLE_ASH_MATH_SUPPORT
+                                       || c == CTLENDARI
+#endif
+                  )) {
+                       /* c == '=' || c == ':' || c == CTLENDARI */
+                       length++;
+               }
+               if (length > 0) {
+                       int newloc;
+                       expdest = stack_nputstr(p, length, expdest);
+                       newloc = expdest - (char *)stackblock();
+                       if (breakall && !inquotes && newloc > startloc) {
+                               recordregion(startloc, newloc, 0);
+                       }
+                       startloc = newloc;
+               }
+               p += length + 1;
+               length = 0;
 
-       /* Eat all trailing newlines */
-       dest = expdest;
-       for (; dest > (char *)stackblock() && dest[-1] == '\n';)
-               STUNPUTC(dest);
-       expdest = dest;
+               switch (c) {
+               case '\0':
+                       goto breakloop;
+               case '=':
+                       if (flag & EXP_VARTILDE2) {
+                               p--;
+                               continue;
+                       }
+                       flag |= EXP_VARTILDE2;
+                       reject++;
+                       /* fall through */
+               case ':':
+                       /*
+                        * sort of a hack - expand tildes in variable
+                        * assignments (after the first '=' and after ':'s).
+                        */
+                       if (*--p == '~') {
+                               goto tilde;
+                       }
+                       continue;
+               }
 
-       if (quoted == 0)
-               recordregion(startloc, dest - (char *)stackblock(), 0);
-       TRACE(("evalbackq: size=%d: \"%.*s\"\n",
-               (dest - (char *)stackblock()) - startloc,
-               (dest - (char *)stackblock()) - startloc,
-               stackblock() + startloc));
+               switch (c) {
+               case CTLENDVAR: /* ??? */
+                       goto breakloop;
+               case CTLQUOTEMARK:
+                       /* "$@" syntax adherence hack */
+                       if (
+                               !inquotes &&
+                               !memcmp(p, dolatstr, 4) &&
+                               (p[4] == CTLQUOTEMARK || (
+                                       p[4] == CTLENDVAR &&
+                                       p[5] == CTLQUOTEMARK
+                               ))
+                       ) {
+                               p = evalvar(p + 1, flag) + 1;
+                               goto start;
+                       }
+                       inquotes = !inquotes;
+ addquote:
+                       if (quotes) {
+                               p--;
+                               length++;
+                               startloc++;
+                       }
+                       break;
+               case CTLESC:
+                       startloc++;
+                       length++;
+                       goto addquote;
+               case CTLVAR:
+                       p = evalvar(p, flag);
+                       goto start;
+               case CTLBACKQ:
+                       c = 0;
+               case CTLBACKQ|CTLQUOTE:
+                       expbackq(argbackq->n, c, quotes);
+                       argbackq = argbackq->next;
+                       goto start;
+#if ENABLE_ASH_MATH_SUPPORT
+               case CTLENDARI:
+                       p--;
+                       expari(quotes);
+                       goto start;
+#endif
+               }
+       }
+ breakloop:
+       ;
 }
 
-
 static char *
 scanleft(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
        int zero)
@@ -5872,7 +5582,6 @@ scanleft(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
        return 0;
 }
 
-
 static char *
 scanright(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
        int zero)
@@ -5907,16 +5616,35 @@ scanright(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
        return 0;
 }
 
-static const char *
-subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes)
+static void varunset(const char *, const char *, const char *, int) ATTRIBUTE_NORETURN;
+static void
+varunset(const char *end, const char *var, const char *umsg, int varflags)
 {
-       char *startp;
-       char *loc;
-       int saveherefd = herefd;
-       struct nodelist *saveargbackq = argbackq;
-       int amount;
-       char *rmesc, *rmescend;
-       int zero;
+       const char *msg;
+       const char *tail;
+
+       tail = nullstr;
+       msg = "parameter not set";
+       if (umsg) {
+               if (*end == CTLENDVAR) {
+                       if (varflags & VSNUL)
+                               tail = " or null";
+               } else
+                       msg = umsg;
+       }
+       ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail);
+}
+
+static const char *
+subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes)
+{
+       char *startp;
+       char *loc;
+       int saveherefd = herefd;
+       struct nodelist *saveargbackq = argbackq;
+       int amount;
+       char *rmesc, *rmescend;
+       int zero;
        char *(*scan)(char *, char *, char *, char *, int , int);
 
        herefd = -1;
@@ -5975,6 +5703,122 @@ subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varfla
        return loc;
 }
 
+/*
+ * Add the value of a specialized variable to the stack string.
+ */
+static ssize_t
+varvalue(char *name, int varflags, int flags)
+{
+       int num;
+       char *p;
+       int i;
+       int sep = 0;
+       int sepq = 0;
+       ssize_t len = 0;
+       char **ap;
+       int syntax;
+       int quoted = varflags & VSQUOTE;
+       int subtype = varflags & VSTYPE;
+       int quotes = flags & (EXP_FULL | EXP_CASE);
+
+       if (quoted && (flags & EXP_FULL))
+               sep = 1 << CHAR_BIT;
+
+       syntax = quoted ? DQSYNTAX : BASESYNTAX;
+       switch (*name) {
+       case '$':
+               num = rootpid;
+               goto numvar;
+       case '?':
+               num = exitstatus;
+               goto numvar;
+       case '#':
+               num = shellparam.nparam;
+               goto numvar;
+       case '!':
+               num = backgndpid;
+               if (num == 0)
+                       return -1;
+ numvar:
+               len = cvtnum(num);
+               break;
+       case '-':
+               p = makestrspace(NOPTS, expdest);
+               for (i = NOPTS - 1; i >= 0; i--) {
+                       if (optlist[i]) {
+                               USTPUTC(optletters(i), p);
+                               len++;
+                       }
+               }
+               expdest = p;
+               break;
+       case '@':
+               if (sep)
+                       goto param;
+               /* fall through */
+       case '*':
+               sep = ifsset() ? signed_char2int(ifsval()[0]) : ' ';
+               if (quotes && (SIT(sep, syntax) == CCTL || SIT(sep, syntax) == CBACK))
+                       sepq = 1;
+ param:
+               ap = shellparam.p;
+               if (!ap)
+                       return -1;
+               while ((p = *ap++)) {
+                       size_t partlen;
+
+                       partlen = strlen(p);
+                       len += partlen;
+
+                       if (!(subtype == VSPLUS || subtype == VSLENGTH))
+                               memtodest(p, partlen, syntax, quotes);
+
+                       if (*ap && sep) {
+                               char *q;
+
+                               len++;
+                               if (subtype == VSPLUS || subtype == VSLENGTH) {
+                                       continue;
+                               }
+                               q = expdest;
+                               if (sepq)
+                                       STPUTC(CTLESC, q);
+                               STPUTC(sep, q);
+                               expdest = q;
+                       }
+               }
+               return len;
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+               num = atoi(name);
+               if (num < 0 || num > shellparam.nparam)
+                       return -1;
+               p = num ? shellparam.p[num - 1] : arg0;
+               goto value;
+       default:
+               p = lookupvar(name);
+ value:
+               if (!p)
+                       return -1;
+
+               len = strlen(p);
+               if (!(subtype == VSPLUS || subtype == VSLENGTH))
+                       memtodest(p, len, syntax, quotes);
+               return len;
+       }
+
+       if (subtype == VSPLUS || subtype == VSLENGTH)
+               STADJUST(-len, expdest);
+       return len;
+}
 
 /*
  * Expand a variable, and return a pointer to the next character in the
@@ -6114,300 +5958,311 @@ evalvar(char *p, int flag)
        return p;
 }
 
-
 /*
- * Put a string on the stack.
+ * Break the argument string into pieces based upon IFS and add the
+ * strings to the argument list.  The regions of the string to be
+ * searched for IFS characters have been stored by recordregion.
  */
 static void
-memtodest(const char *p, size_t len, int syntax, int quotes)
+ifsbreakup(char *string, struct arglist *arglist)
 {
-       char *q = expdest;
-
-       q = makestrspace(len * 2, q);
+       struct ifsregion *ifsp;
+       struct strlist *sp;
+       char *start;
+       char *p;
+       char *q;
+       const char *ifs, *realifs;
+       int ifsspc;
+       int nulonly;
 
-       while (len--) {
-               int c = SC2INT(*p++);
-               if (!c)
-                       continue;
-               if (quotes && (SIT(c, syntax) == CCTL || SIT(c, syntax) == CBACK))
-                       USTPUTC(CTLESC, q);
-               USTPUTC(c, q);
+       start = string;
+       if (ifslastp != NULL) {
+               ifsspc = 0;
+               nulonly = 0;
+               realifs = ifsset() ? ifsval() : defifs;
+               ifsp = &ifsfirst;
+               do {
+                       p = string + ifsp->begoff;
+                       nulonly = ifsp->nulonly;
+                       ifs = nulonly ? nullstr : realifs;
+                       ifsspc = 0;
+                       while (p < string + ifsp->endoff) {
+                               q = p;
+                               if (*p == CTLESC)
+                                       p++;
+                               if (!strchr(ifs, *p)) {
+                                       p++;
+                                       continue;
+                               }
+                               if (!nulonly)
+                                       ifsspc = (strchr(defifs, *p) != NULL);
+                               /* Ignore IFS whitespace at start */
+                               if (q == start && ifsspc) {
+                                       p++;
+                                       start = p;
+                                       continue;
+                               }
+                               *q = '\0';
+                               sp = stalloc(sizeof(*sp));
+                               sp->text = start;
+                               *arglist->lastp = sp;
+                               arglist->lastp = &sp->next;
+                               p++;
+                               if (!nulonly) {
+                                       for (;;) {
+                                               if (p >= string + ifsp->endoff) {
+                                                       break;
+                                               }
+                                               q = p;
+                                               if (*p == CTLESC)
+                                                       p++;
+                                               if (strchr(ifs, *p) == NULL ) {
+                                                       p = q;
+                                                       break;
+                                               } else if (strchr(defifs, *p) == NULL) {
+                                                       if (ifsspc) {
+                                                               p++;
+                                                               ifsspc = 0;
+                                                       } else {
+                                                               p = q;
+                                                               break;
+                                                       }
+                                               } else
+                                                       p++;
+                                       }
+                               }
+                               start = p;
+                       } /* while */
+                       ifsp = ifsp->next;
+               } while (ifsp != NULL);
+               if (nulonly)
+                       goto add;
        }
 
-       expdest = q;
-}
+       if (!*start)
+               return;
 
+ add:
+       sp = stalloc(sizeof(*sp));
+       sp->text = start;
+       *arglist->lastp = sp;
+       arglist->lastp = &sp->next;
+}
 
 static void
-strtodest(const char *p, int syntax, int quotes)
+ifsfree(void)
 {
-       memtodest(p, strlen(p), syntax, quotes);
-}
+       struct ifsregion *p;
 
+       INT_OFF;
+       p = ifsfirst.next;
+       do {
+               struct ifsregion *ifsp;
+               ifsp = p->next;
+               free(p);
+               p = ifsp;
+       } while (p);
+       ifslastp = NULL;
+       ifsfirst.next = NULL;
+       INT_ON;
+}
 
 /*
- * Add the value of a specialized variable to the stack string.
+ * Add a file name to the list.
  */
-static ssize_t
-varvalue(char *name, int varflags, int flags)
+static void
+addfname(const char *name)
 {
-       int num;
-       char *p;
-       int i;
-       int sep = 0;
-       int sepq = 0;
-       ssize_t len = 0;
-       char **ap;
-       int syntax;
-       int quoted = varflags & VSQUOTE;
-       int subtype = varflags & VSTYPE;
-       int quotes = flags & (EXP_FULL | EXP_CASE);
-
-       if (quoted && (flags & EXP_FULL))
-               sep = 1 << CHAR_BIT;
-
-       syntax = quoted ? DQSYNTAX : BASESYNTAX;
-       switch (*name) {
-       case '$':
-               num = rootpid;
-               goto numvar;
-       case '?':
-               num = exitstatus;
-               goto numvar;
-       case '#':
-               num = shellparam.nparam;
-               goto numvar;
-       case '!':
-               num = backgndpid;
-               if (num == 0)
-                       return -1;
- numvar:
-               len = cvtnum(num);
-               break;
-       case '-':
-               p = makestrspace(NOPTS, expdest);
-               for (i = NOPTS - 1; i >= 0; i--) {
-                       if (optlist[i]) {
-                               USTPUTC(optletters(i), p);
-                               len++;
-                       }
-               }
-               expdest = p;
-               break;
-       case '@':
-               if (sep)
-                       goto param;
-               /* fall through */
-       case '*':
-               sep = ifsset() ? SC2INT(ifsval()[0]) : ' ';
-               if (quotes && (SIT(sep, syntax) == CCTL || SIT(sep, syntax) == CBACK))
-                       sepq = 1;
- param:
-               ap = shellparam.p;
-               if (!ap)
-                       return -1;
-               while ((p = *ap++)) {
-                       size_t partlen;
-
-                       partlen = strlen(p);
-                       len += partlen;
-
-                       if (!(subtype == VSPLUS || subtype == VSLENGTH))
-                               memtodest(p, partlen, syntax, quotes);
-
-                       if (*ap && sep) {
-                               char *q;
-
-                               len++;
-                               if (subtype == VSPLUS || subtype == VSLENGTH) {
-                                       continue;
-                               }
-                               q = expdest;
-                               if (sepq)
-                                       STPUTC(CTLESC, q);
-                               STPUTC(sep, q);
-                               expdest = q;
-                       }
-               }
-               return len;
-       case '0':
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case '5':
-       case '6':
-       case '7':
-       case '8':
-       case '9':
-               num = atoi(name);
-               if (num < 0 || num > shellparam.nparam)
-                       return -1;
-               p = num ? shellparam.p[num - 1] : arg0;
-               goto value;
-       default:
-               p = lookupvar(name);
- value:
-               if (!p)
-                       return -1;
-
-               len = strlen(p);
-               if (!(subtype == VSPLUS || subtype == VSLENGTH))
-                       memtodest(p, len, syntax, quotes);
-               return len;
-       }
+       struct strlist *sp;
 
-       if (subtype == VSPLUS || subtype == VSLENGTH)
-               STADJUST(-len, expdest);
-       return len;
+       sp = stalloc(sizeof(*sp));
+       sp->text = ststrdup(name);
+       *exparg.lastp = sp;
+       exparg.lastp = &sp->next;
 }
 
+static char *expdir;
 
 /*
- * Record the fact that we have to scan this region of the
- * string for IFS characters.
+ * Do metacharacter (i.e. *, ?, [...]) expansion.
  */
 static void
-recordregion(int start, int end, int nulonly)
+expmeta(char *enddir, char *name)
 {
-       struct ifsregion *ifsp;
+       char *p;
+       const char *cp;
+       char *start;
+       char *endname;
+       int metaflag;
+       struct stat statb;
+       DIR *dirp;
+       struct dirent *dp;
+       int atend;
+       int matchdot;
 
-       if (ifslastp == NULL) {
-               ifsp = &ifsfirst;
+       metaflag = 0;
+       start = name;
+       for (p = name; *p; p++) {
+               if (*p == '*' || *p == '?')
+                       metaflag = 1;
+               else if (*p == '[') {
+                       char *q = p + 1;
+                       if (*q == '!')
+                               q++;
+                       for (;;) {
+                               if (*q == '\\')
+                                       q++;
+                               if (*q == '/' || *q == '\0')
+                                       break;
+                               if (*++q == ']') {
+                                       metaflag = 1;
+                                       break;
+                               }
+                       }
+               } else if (*p == '\\')
+                       p++;
+               else if (*p == '/') {
+                       if (metaflag)
+                               goto out;
+                       start = p + 1;
+               }
+       }
+ out:
+       if (metaflag == 0) {    /* we've reached the end of the file name */
+               if (enddir != expdir)
+                       metaflag++;
+               p = name;
+               do {
+                       if (*p == '\\')
+                               p++;
+                       *enddir++ = *p;
+               } while (*p++);
+               if (metaflag == 0 || lstat(expdir, &statb) >= 0)
+                       addfname(expdir);
+               return;
+       }
+       endname = p;
+       if (name < start) {
+               p = name;
+               do {
+                       if (*p == '\\')
+                               p++;
+                       *enddir++ = *p++;
+               } while (p < start);
+       }
+       if (enddir == expdir) {
+               cp = ".";
+       } else if (enddir == expdir + 1 && *expdir == '/') {
+               cp = "/";
        } else {
-               INT_OFF;
-               ifsp = ckmalloc(sizeof(*ifsp));
-               ifsp->next = NULL;
-               ifslastp->next = ifsp;
-               INT_ON;
+               cp = expdir;
+               enddir[-1] = '\0';
        }
-       ifslastp = ifsp;
-       ifslastp->begoff = start;
-       ifslastp->endoff = end;
-       ifslastp->nulonly = nulonly;
+       dirp = opendir(cp);
+       if (dirp == NULL)
+               return;
+       if (enddir != expdir)
+               enddir[-1] = '/';
+       if (*endname == 0) {
+               atend = 1;
+       } else {
+               atend = 0;
+               *endname++ = '\0';
+       }
+       matchdot = 0;
+       p = start;
+       if (*p == '\\')
+               p++;
+       if (*p == '.')
+               matchdot++;
+       while (! intpending && (dp = readdir(dirp)) != NULL) {
+               if (dp->d_name[0] == '.' && ! matchdot)
+                       continue;
+               if (pmatch(start, dp->d_name)) {
+                       if (atend) {
+                               strcpy(enddir, dp->d_name);
+                               addfname(expdir);
+                       } else {
+                               for (p = enddir, cp = dp->d_name; (*p++ = *cp++) != '\0';)
+                                       continue;
+                               p[-1] = '/';
+                               expmeta(p, endname);
+                       }
+               }
+       }
+       closedir(dirp);
+       if (! atend)
+               endname[-1] = '/';
 }
 
-
-/*
- * Break the argument string into pieces based upon IFS and add the
- * strings to the argument list.  The regions of the string to be
- * searched for IFS characters have been stored by recordregion.
- */
-static void
-ifsbreakup(char *string, struct arglist *arglist)
+static struct strlist *
+msort(struct strlist *list, int len)
 {
-       struct ifsregion *ifsp;
-       struct strlist *sp;
-       char *start;
-       char *p;
-       char *q;
-       const char *ifs, *realifs;
-       int ifsspc;
-       int nulonly;
+       struct strlist *p, *q = NULL;
+       struct strlist **lpp;
+       int half;
+       int n;
 
-       start = string;
-       if (ifslastp != NULL) {
-               ifsspc = 0;
-               nulonly = 0;
-               realifs = ifsset() ? ifsval() : defifs;
-               ifsp = &ifsfirst;
-               do {
-                       p = string + ifsp->begoff;
-                       nulonly = ifsp->nulonly;
-                       ifs = nulonly ? nullstr : realifs;
-                       ifsspc = 0;
-                       while (p < string + ifsp->endoff) {
-                               q = p;
-                               if (*p == CTLESC)
-                                       p++;
-                               if (!strchr(ifs, *p)) {
-                                       p++;
-                                       continue;
-                               }
-                               if (!nulonly)
-                                       ifsspc = (strchr(defifs, *p) != NULL);
-                               /* Ignore IFS whitespace at start */
-                               if (q == start && ifsspc) {
-                                       p++;
-                                       start = p;
-                                       continue;
-                               }
-                               *q = '\0';
-                               sp = stalloc(sizeof(*sp));
-                               sp->text = start;
-                               *arglist->lastp = sp;
-                               arglist->lastp = &sp->next;
-                               p++;
-                               if (!nulonly) {
-                                       for (;;) {
-                                               if (p >= string + ifsp->endoff) {
-                                                       break;
-                                               }
-                                               q = p;
-                                               if (*p == CTLESC)
-                                                       p++;
-                                               if (strchr(ifs, *p) == NULL ) {
-                                                       p = q;
-                                                       break;
-                                               } else if (strchr(defifs, *p) == NULL) {
-                                                       if (ifsspc) {
-                                                               p++;
-                                                               ifsspc = 0;
-                                                       } else {
-                                                               p = q;
-                                                               break;
-                                                       }
-                                               } else
-                                                       p++;
-                                       }
-                               }
-                               start = p;
-                       } /* while */
-                       ifsp = ifsp->next;
-               } while (ifsp != NULL);
-               if (nulonly)
-                       goto add;
+       if (len <= 1)
+               return list;
+       half = len >> 1;
+       p = list;
+       for (n = half; --n >= 0; ) {
+               q = p;
+               p = p->next;
        }
-
-       if (!*start)
-               return;
-
- add:
-       sp = stalloc(sizeof(*sp));
-       sp->text = start;
-       *arglist->lastp = sp;
-       arglist->lastp = &sp->next;
+       q->next = NULL;                 /* terminate first half of list */
+       q = msort(list, half);          /* sort first half of list */
+       p = msort(p, len - half);               /* sort second half */
+       lpp = &list;
+       for (;;) {
+#if ENABLE_LOCALE_SUPPORT
+               if (strcoll(p->text, q->text) < 0)
+#else
+               if (strcmp(p->text, q->text) < 0)
+#endif
+                                               {
+                       *lpp = p;
+                       lpp = &p->next;
+                       p = *lpp;
+                       if (p == NULL) {
+                               *lpp = q;
+                               break;
+                       }
+               } else {
+                       *lpp = q;
+                       lpp = &q->next;
+                       q = *lpp;
+                       if (q == NULL) {
+                               *lpp = p;
+                               break;
+                       }
+               }
+       }
+       return list;
 }
 
-static void
-ifsfree(void)
+/*
+ * Sort the results of file name expansion.  It calculates the number of
+ * strings to sort and then calls msort (short for merge sort) to do the
+ * work.
+ */
+static struct strlist *
+expsort(struct strlist *str)
 {
-       struct ifsregion *p;
+       int len;
+       struct strlist *sp;
 
-       INT_OFF;
-       p = ifsfirst.next;
-       do {
-               struct ifsregion *ifsp;
-               ifsp = p->next;
-               free(p);
-               p = ifsp;
-       } while (p);
-       ifslastp = NULL;
-       ifsfirst.next = NULL;
-       INT_ON;
+       len = 0;
+       for (sp = str; sp; sp = sp->next)
+               len++;
+       return msort(str, len);
 }
 
-static void expmeta(char *, char *);
-static struct strlist *expsort(struct strlist *);
-static struct strlist *msort(struct strlist *, int);
-
-static char *expdir;
-
-
 static void
 expandmeta(struct strlist *str, int flag)
 {
-       static const char metachars[] = {
+       static const char metachars[] ALIGN1 = {
                '*', '?', '[', 0
        };
        /* TODO - EXP_REDIR */
@@ -6454,278 +6309,75 @@ expandmeta(struct strlist *str, int flag)
        }
 }
 
-
 /*
- * Add a file name to the list.
+ * Perform variable substitution and command substitution on an argument,
+ * placing the resulting list of arguments in arglist.  If EXP_FULL is true,
+ * perform splitting and file name expansion.  When arglist is NULL, perform
+ * here document expansion.
  */
 static void
-addfname(const char *name)
+expandarg(union node *arg, struct arglist *arglist, int flag)
 {
        struct strlist *sp;
+       char *p;
 
-       sp = stalloc(sizeof(*sp));
-       sp->text = ststrdup(name);
-       *exparg.lastp = sp;
-       exparg.lastp = &sp->next;
+       argbackq = arg->narg.backquote;
+       STARTSTACKSTR(expdest);
+       ifsfirst.next = NULL;
+       ifslastp = NULL;
+       argstr(arg->narg.text, flag);
+       p = _STPUTC('\0', expdest);
+       expdest = p - 1;
+       if (arglist == NULL) {
+               return;                 /* here document expanded */
+       }
+       p = grabstackstr(p);
+       exparg.lastp = &exparg.list;
+       /*
+        * TODO - EXP_REDIR
+        */
+       if (flag & EXP_FULL) {
+               ifsbreakup(p, &exparg);
+               *exparg.lastp = NULL;
+               exparg.lastp = &exparg.list;
+               expandmeta(exparg.list, flag);
+       } else {
+               if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
+                       rmescapes(p);
+               sp = stalloc(sizeof(*sp));
+               sp->text = p;
+               *exparg.lastp = sp;
+               exparg.lastp = &sp->next;
+       }
+       if (ifsfirst.next)
+               ifsfree();
+       *exparg.lastp = NULL;
+       if (exparg.list) {
+               *arglist->lastp = exparg.list;
+               arglist->lastp = exparg.lastp;
+       }
 }
 
-
 /*
- * Do metacharacter (i.e. *, ?, [...]) expansion.
+ * Expand shell variables and backquotes inside a here document.
  */
 static void
-expmeta(char *enddir, char *name)
+expandhere(union node *arg, int fd)
 {
-       char *p;
-       const char *cp;
-       char *start;
-       char *endname;
-       int metaflag;
-       struct stat statb;
-       DIR *dirp;
-       struct dirent *dp;
-       int atend;
-       int matchdot;
-
-       metaflag = 0;
-       start = name;
-       for (p = name; *p; p++) {
-               if (*p == '*' || *p == '?')
-                       metaflag = 1;
-               else if (*p == '[') {
-                       char *q = p + 1;
-                       if (*q == '!')
-                               q++;
-                       for (;;) {
-                               if (*q == '\\')
-                                       q++;
-                               if (*q == '/' || *q == '\0')
-                                       break;
-                               if (*++q == ']') {
-                                       metaflag = 1;
-                                       break;
-                               }
-                       }
-               } else if (*p == '\\')
-                       p++;
-               else if (*p == '/') {
-                       if (metaflag)
-                               goto out;
-                       start = p + 1;
-               }
-       }
- out:
-       if (metaflag == 0) {    /* we've reached the end of the file name */
-               if (enddir != expdir)
-                       metaflag++;
-               p = name;
-               do {
-                       if (*p == '\\')
-                               p++;
-                       *enddir++ = *p;
-               } while (*p++);
-               if (metaflag == 0 || lstat(expdir, &statb) >= 0)
-                       addfname(expdir);
-               return;
-       }
-       endname = p;
-       if (name < start) {
-               p = name;
-               do {
-                       if (*p == '\\')
-                               p++;
-                       *enddir++ = *p++;
-               } while (p < start);
-       }
-       if (enddir == expdir) {
-               cp = ".";
-       } else if (enddir == expdir + 1 && *expdir == '/') {
-               cp = "/";
-       } else {
-               cp = expdir;
-               enddir[-1] = '\0';
-       }
-       dirp = opendir(cp);
-       if (dirp == NULL)
-               return;
-       if (enddir != expdir)
-               enddir[-1] = '/';
-       if (*endname == 0) {
-               atend = 1;
-       } else {
-               atend = 0;
-               *endname++ = '\0';
-       }
-       matchdot = 0;
-       p = start;
-       if (*p == '\\')
-               p++;
-       if (*p == '.')
-               matchdot++;
-       while (! intpending && (dp = readdir(dirp)) != NULL) {
-               if (dp->d_name[0] == '.' && ! matchdot)
-                       continue;
-               if (pmatch(start, dp->d_name)) {
-                       if (atend) {
-                               strcpy(enddir, dp->d_name);
-                               addfname(expdir);
-                       } else {
-                               for (p = enddir, cp = dp->d_name; (*p++ = *cp++) != '\0';)
-                                       continue;
-                               p[-1] = '/';
-                               expmeta(p, endname);
-                       }
-               }
-       }
-       closedir(dirp);
-       if (! atend)
-               endname[-1] = '/';
-}
-
-
-/*
- * Sort the results of file name expansion.  It calculates the number of
- * strings to sort and then calls msort (short for merge sort) to do the
- * work.
- */
-static struct strlist *
-expsort(struct strlist *str)
-{
-       int len;
-       struct strlist *sp;
-
-       len = 0;
-       for (sp = str; sp; sp = sp->next)
-               len++;
-       return msort(str, len);
-}
-
-
-static struct strlist *
-msort(struct strlist *list, int len)
-{
-       struct strlist *p, *q = NULL;
-       struct strlist **lpp;
-       int half;
-       int n;
-
-       if (len <= 1)
-               return list;
-       half = len >> 1;
-       p = list;
-       for (n = half; --n >= 0; ) {
-               q = p;
-               p = p->next;
-       }
-       q->next = NULL;                 /* terminate first half of list */
-       q = msort(list, half);          /* sort first half of list */
-       p = msort(p, len - half);               /* sort second half */
-       lpp = &list;
-       for (;;) {
-#if ENABLE_LOCALE_SUPPORT
-               if (strcoll(p->text, q->text) < 0)
-#else
-               if (strcmp(p->text, q->text) < 0)
-#endif
-                                               {
-                       *lpp = p;
-                       lpp = &p->next;
-                       p = *lpp;
-                       if (p == NULL) {
-                               *lpp = q;
-                               break;
-                       }
-               } else {
-                       *lpp = q;
-                       lpp = &q->next;
-                       q = *lpp;
-                       if (q == NULL) {
-                               *lpp = p;
-                               break;
-                       }
-               }
-       }
-       return list;
-}
-
+       herefd = fd;
+       expandarg(arg, (struct arglist *)NULL, 0);
+       full_write(fd, stackblock(), expdest - (char *)stackblock());
+}
 
 /*
  * Returns true if the pattern matches the string.
  */
-static int patmatch(char *pattern, const char *string)
+static int
+patmatch(char *pattern, const char *string)
 {
        return pmatch(preglob(pattern, 0, 0), string);
 }
 
-
-/*
- * Remove any CTLESC characters from a string.
- */
-static char *
-_rmescapes(char *str, int flag)
-{
-       char *p, *q, *r;
-       static const char qchars[] = { CTLESC, CTLQUOTEMARK, 0 };
-       unsigned inquotes;
-       int notescaped;
-       int globbing;
-
-       p = strpbrk(str, qchars);
-       if (!p) {
-               return str;
-       }
-       q = p;
-       r = str;
-       if (flag & RMESCAPE_ALLOC) {
-               size_t len = p - str;
-               size_t fulllen = len + strlen(p) + 1;
-
-               if (flag & RMESCAPE_GROW) {
-                       r = makestrspace(fulllen, expdest);
-               } else if (flag & RMESCAPE_HEAP) {
-                       r = ckmalloc(fulllen);
-               } else {
-                       r = stalloc(fulllen);
-               }
-               q = r;
-               if (len > 0) {
-                       q = memcpy(q, str, len) + len;
-               }
-       }
-       inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
-       globbing = flag & RMESCAPE_GLOB;
-       notescaped = globbing;
-       while (*p) {
-               if (*p == CTLQUOTEMARK) {
-                       inquotes = ~inquotes;
-                       p++;
-                       notescaped = globbing;
-                       continue;
-               }
-               if (*p == '\\') {
-                       /* naked back slash */
-                       notescaped = 0;
-                       goto copy;
-               }
-               if (*p == CTLESC) {
-                       p++;
-                       if (notescaped && inquotes && *p != '/') {
-                               *q++ = '\\';
-                       }
-               }
-               notescaped = globbing;
- copy:
-               *q++ = *p++;
-       }
-       *q = '\0';
-       if (flag & RMESCAPE_GROW) {
-               expdest = r;
-               STADJUST(q - r + 1, expdest);
-       }
-       return r;
-}
-
-
 /*
  * See if a pattern matches in a case statement.
  */
@@ -6747,4879 +6399,4892 @@ casematch(union node *pattern, char *val)
 }
 
 
-/*
- * Our own itoa().
- */
-static int
-cvtnum(arith_t num)
-{
-       int len;
+/* ============ find_command */
 
-       expdest = makestrspace(32, expdest);
-#if ENABLE_ASH_MATH_SUPPORT_64
-       len = fmtstr(expdest, 32, "%lld", (long long) num);
-#else
-       len = fmtstr(expdest, 32, "%ld", num);
-#endif
-       STADJUST(len, expdest);
-       return len;
-}
+struct builtincmd {
+       const char *name;
+       int (*builtin)(int, char **);
+       /* unsigned flags; */
+};
+#define IS_BUILTIN_SPECIAL(b) ((b)->name[0] & 1)
+#define IS_BUILTIN_REGULAR(b) ((b)->name[0] & 2)
+#define IS_BUILTIN_ASSIGN(b) ((b)->name[0] & 4)
 
-static void varunset(const char *, const char *, const char *, int) ATTRIBUTE_NORETURN;
-static void
-varunset(const char *end, const char *var, const char *umsg, int varflags)
-{
-       const char *msg;
-       const char *tail;
+struct cmdentry {
+       int cmdtype;
+       union param {
+               int index;
+               const struct builtincmd *cmd;
+               struct funcnode *func;
+       } u;
+};
+/* values of cmdtype */
+#define CMDUNKNOWN      -1      /* no entry in table for command */
+#define CMDNORMAL       0       /* command is an executable program */
+#define CMDFUNCTION     1       /* command is a shell function */
+#define CMDBUILTIN      2       /* command is a shell builtin */
 
-       tail = nullstr;
-       msg = "parameter not set";
-       if (umsg) {
-               if (*end == CTLENDVAR) {
-                       if (varflags & VSNUL)
-                               tail = " or null";
-               } else
-                       msg = umsg;
-       }
-       ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail);
-}
+/* action to find_command() */
+#define DO_ERR          0x01    /* prints errors */
+#define DO_ABS          0x02    /* checks absolute paths */
+#define DO_NOFUNC       0x04    /* don't return shell functions, for command */
+#define DO_ALTPATH      0x08    /* using alternate path */
+#define DO_ALTBLTIN     0x20    /* %builtin in alt. path */
+
+static void find_command(char *, struct cmdentry *, int, const char *);
 
 
-/*      input.c      */
+/* ============ Hashing commands */
 
 /*
- * This implements the input routines used by the parser.
+ * When commands are first encountered, they are entered in a hash table.
+ * This ensures that a full path search will not have to be done for them
+ * on each invocation.
+ *
+ * We should investigate converting to a linear search, even though that
+ * would make the command name "hash" a misnomer.
  */
 
-#define EOF_NLEFT -99           /* value of parsenleft when EOF pushed back */
+#define CMDTABLESIZE 31         /* should be prime */
+#define ARB 1                   /* actual size determined at run time */
 
-static void pushfile(void);
+struct tblentry {
+       struct tblentry *next;  /* next entry in hash chain */
+       union param param;      /* definition of builtin function */
+       short cmdtype;          /* index identifying command */
+       char rehash;            /* if set, cd done since entry created */
+       char cmdname[ARB];      /* name of command */
+};
 
-/*
- * Read a character from the script, returning PEOF on end of file.
- * Nul characters in the input are silently discarded.
- */
-static int preadbuffer(void);
-#define pgetc_as_macro()   (--parsenleft >= 0? SC2INT(*parsenextc++) : preadbuffer())
+static struct tblentry *cmdtable[CMDTABLESIZE];
+static int builtinloc = -1;             /* index in path of %builtin, or -1 */
 
-#if ENABLE_ASH_OPTIMIZE_FOR_SIZE
-#define pgetc_macro() pgetc()
-static int
-pgetc(void)
-{
-       return pgetc_as_macro();
-}
-#else
-#define pgetc_macro()   pgetc_as_macro()
-static int
-pgetc(void)
+static void
+tryexec(char *cmd, char **argv, char **envp)
 {
-       return pgetc_macro();
-}
-#endif
+       int repeated = 0;
 
-/*
- * Same as pgetc(), but ignores PEOA.
- */
-#if ENABLE_ASH_ALIAS
-static int
-pgetc2(void)
-{
-       int c;
+#if ENABLE_FEATURE_SH_STANDALONE
+       if (strchr(cmd, '/') == NULL) {
+               const struct bb_applet *a;
+
+               a = find_applet_by_name(cmd);
+               if (a) {
+                       if (a->noexec)
+                               run_appletstruct_and_exit(a, argv);
+                       /* re-exec ourselves with the new arguments */
+                       execve(bb_busybox_exec_path, argv, envp);
+                       /* If they called chroot or otherwise made the binary no longer
+                        * executable, fall through */
+               }
+       }
+#endif
 
+ repeat:
+#ifdef SYSV
        do {
-               c = pgetc_macro();
-       } while (c == PEOA);
-       return c;
-}
+               execve(cmd, argv, envp);
+       } while (errno == EINTR);
 #else
-static int
-pgetc2(void)
-{
-       return pgetc_macro();
-}
+       execve(cmd, argv, envp);
 #endif
+       if (repeated++) {
+               free(argv);
+       } else if (errno == ENOEXEC) {
+               char **ap;
+               char **new;
+
+               for (ap = argv; *ap; ap++)
+                       ;
+               ap = new = ckmalloc((ap - argv + 2) * sizeof(char *));
+               ap[1] = cmd;
+               ap[0] = cmd = (char *)DEFAULT_SHELL;
+               ap += 2;
+               argv++;
+               while ((*ap++ = *argv++))
+                       ;
+               argv = new;
+               goto repeat;
+       }
+}
 
 /*
- * Read a line from the script.
+ * Exec a program.  Never returns.  If you change this routine, you may
+ * have to change the find_command routine as well.
  */
-static char *
-pfgets(char *line, int len)
+#define environment() listvars(VEXPORT, VUNSET, 0)
+static void shellexec(char **, const char *, int) ATTRIBUTE_NORETURN;
+static void
+shellexec(char **argv, const char *path, int idx)
 {
-       char *p = line;
-       int nleft = len;
-       int c;
+       char *cmdname;
+       int e;
+       char **envp;
+       int exerrno;
 
-       while (--nleft > 0) {
-               c = pgetc2();
-               if (c == PEOF) {
-                       if (p == line)
-                               return NULL;
-                       break;
+       clearredir(1);
+       envp = environment();
+       if (strchr(argv[0], '/')
+#if ENABLE_FEATURE_SH_STANDALONE
+        || find_applet_by_name(argv[0])
+#endif
+       ) {
+               tryexec(argv[0], argv, envp);
+               e = errno;
+       } else {
+               e = ENOENT;
+               while ((cmdname = padvance(&path, argv[0])) != NULL) {
+                       if (--idx < 0 && pathopt == NULL) {
+                               tryexec(cmdname, argv, envp);
+                               if (errno != ENOENT && errno != ENOTDIR)
+                                       e = errno;
+                       }
+                       stunalloc(cmdname);
                }
-               *p++ = c;
-               if (c == '\n')
-                       break;
        }
-       *p = '\0';
-       return line;
-}
 
-#if ENABLE_FEATURE_EDITING_VI
-#define setvimode(on) do { \
-       if (on) line_input_state->flags |= VI_MODE; \
-       else line_input_state->flags &= ~VI_MODE; \
-} while (0)
-#else
-#define setvimode(on) viflag = 0   /* forcibly keep the option off */
-#endif
+       /* Map to POSIX errors */
+       switch (e) {
+       case EACCES:
+               exerrno = 126;
+               break;
+       case ENOENT:
+               exerrno = 127;
+               break;
+       default:
+               exerrno = 2;
+               break;
+       }
+       exitstatus = exerrno;
+       TRACE(("shellexec failed for %s, errno %d, suppressint %d\n",
+               argv[0], e, suppressint ));
+       ash_msg_and_raise(EXEXEC, "%s: %s", argv[0], errmsg(e, "not found"));
+       /* NOTREACHED */
+}
 
-static int
-preadfd(void)
+static void
+printentry(struct tblentry *cmdp)
 {
-       int nr;
-       char *buf =  parsefile->buf;
-       parsenextc = buf;
+       int idx;
+       const char *path;
+       char *name;
 
- retry:
-#if ENABLE_FEATURE_EDITING
-       if (!iflag || parsefile->fd)
-               nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
-       else {
-#if ENABLE_FEATURE_TAB_COMPLETION
-               line_input_state->path_lookup = pathval();
-#endif
-               nr = read_line_input(cmdedit_prompt, buf, BUFSIZ, line_input_state);
-               if (nr == 0) {
-                       /* Ctrl+C pressed */
-                       if (trap[SIGINT]) {
-                               buf[0] = '\n';
-                               buf[1] = '\0';
-                               raise(SIGINT);
-                               return 1;
-                       }
-                       goto retry;
-               }
-               if (nr < 0 && errno == 0) {
-                       /* Ctrl+D presend */
-                       nr = 0;
-               }
-       }
-#else
-       nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
-#endif
+       idx = cmdp->param.index;
+       path = pathval();
+       do {
+               name = padvance(&path, cmdp->cmdname);
+               stunalloc(name);
+       } while (--idx >= 0);
+       out1fmt("%s%s\n", name, (cmdp->rehash ? "*" : nullstr));
+}
 
-       if (nr < 0) {
-               if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
-                       int flags = fcntl(0, F_GETFL, 0);
-                       if (flags >= 0 && flags & O_NONBLOCK) {
-                               flags &=~ O_NONBLOCK;
-                               if (fcntl(0, F_SETFL, flags) >= 0) {
-                                       out2str("sh: turning off NDELAY mode\n");
-                                       goto retry;
-                               }
+/*
+ * Clear out command entries.  The argument specifies the first entry in
+ * PATH which has changed.
+ */
+static void
+clearcmdentry(int firstchange)
+{
+       struct tblentry **tblp;
+       struct tblentry **pp;
+       struct tblentry *cmdp;
+
+       INT_OFF;
+       for (tblp = cmdtable; tblp < &cmdtable[CMDTABLESIZE]; tblp++) {
+               pp = tblp;
+               while ((cmdp = *pp) != NULL) {
+                       if ((cmdp->cmdtype == CMDNORMAL &&
+                            cmdp->param.index >= firstchange)
+                        || (cmdp->cmdtype == CMDBUILTIN &&
+                            builtinloc >= firstchange)
+                       ) {
+                               *pp = cmdp->next;
+                               free(cmdp);
+                       } else {
+                               pp = &cmdp->next;
                        }
                }
        }
-       return nr;
+       INT_ON;
 }
 
 /*
- * Refill the input buffer and return the next input character:
+ * Locate a command in the command hash table.  If "add" is nonzero,
+ * add the command to the table if it is not already present.  The
+ * variable "lastcmdentry" is set to point to the address of the link
+ * pointing to the entry, so that delete_cmd_entry can delete the
+ * entry.
  *
- * 1) If a string was pushed back on the input, pop it;
- * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
- *    from a string so we can't refill the buffer, return EOF.
- * 3) If the is more stuff in this buffer, use it else call read to fill it.
- * 4) Process input up to the next newline, deleting nul characters.
+ * Interrupts must be off if called with add != 0.
  */
-static int
-preadbuffer(void)
+static struct tblentry **lastcmdentry;
+
+static struct tblentry *
+cmdlookup(const char *name, int add)
 {
-       char *q;
-       int more;
-       char savec;
+       unsigned int hashval;
+       const char *p;
+       struct tblentry *cmdp;
+       struct tblentry **pp;
 
-       while (parsefile->strpush) {
-#if ENABLE_ASH_ALIAS
-               if (parsenleft == -1 && parsefile->strpush->ap &&
-                       parsenextc[-1] != ' ' && parsenextc[-1] != '\t') {
-                       return PEOA;
-               }
-#endif
-               popstring();
-               if (--parsenleft >= 0)
-                       return SC2INT(*parsenextc++);
+       p = name;
+       hashval = (unsigned char)*p << 4;
+       while (*p)
+               hashval += (unsigned char)*p++;
+       hashval &= 0x7FFF;
+       pp = &cmdtable[hashval % CMDTABLESIZE];
+       for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
+               if (strcmp(cmdp->cmdname, name) == 0)
+                       break;
+               pp = &cmdp->next;
        }
-       if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
-               return PEOF;
-       flush_stdout_stderr();
-
-       more = parselleft;
-       if (more <= 0) {
- again:
-               more = preadfd();
-               if (more <= 0) {
-                       parselleft = parsenleft = EOF_NLEFT;
-                       return PEOF;
-               }
-       }
-
-       q = parsenextc;
-
-       /* delete nul characters */
-       for (;;) {
-               int c;
-
-               more--;
-               c = *q;
-
-               if (!c)
-                       memmove(q, q + 1, more);
-               else {
-                       q++;
-                       if (c == '\n') {
-                               parsenleft = q - parsenextc - 1;
-                               break;
-                       }
-               }
-
-               if (more <= 0) {
-                       parsenleft = q - parsenextc - 1;
-                       if (parsenleft < 0)
-                               goto again;
-                       break;
-               }
-       }
-       parselleft = more;
-
-       savec = *q;
-       *q = '\0';
-
-       if (vflag) {
-               out2str(parsenextc);
+       if (add && cmdp == NULL) {
+               cmdp = *pp = ckmalloc(sizeof(struct tblentry) - ARB
+                                       + strlen(name) + 1);
+               cmdp->next = NULL;
+               cmdp->cmdtype = CMDUNKNOWN;
+               strcpy(cmdp->cmdname, name);
        }
-
-       *q = savec;
-
-       return SC2INT(*parsenextc++);
-}
-
-/*
- * Undo the last call to pgetc.  Only one character may be pushed back.
- * PEOF may be pushed back.
- */
-static void
-pungetc(void)
-{
-       parsenleft++;
-       parsenextc--;
+       lastcmdentry = pp;
+       return cmdp;
 }
 
 /*
- * Push a string back onto the input at this current parsefile level.
- * We handle aliases this way.
+ * Delete the command entry returned on the last lookup.
  */
 static void
-pushstring(char *s, void *ap)
+delete_cmd_entry(void)
 {
-       struct strpush *sp;
-       size_t len;
+       struct tblentry *cmdp;
 
-       len = strlen(s);
        INT_OFF;
-/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
-       if (parsefile->strpush) {
-               sp = ckmalloc(sizeof(struct strpush));
-               sp->prev = parsefile->strpush;
-               parsefile->strpush = sp;
-       } else
-               sp = parsefile->strpush = &(parsefile->basestrpush);
-       sp->prevstring = parsenextc;
-       sp->prevnleft = parsenleft;
-#if ENABLE_ASH_ALIAS
-       sp->ap = (struct alias *)ap;
-       if (ap) {
-               ((struct alias *)ap)->flag |= ALIASINUSE;
-               sp->string = s;
-       }
-#endif
-       parsenextc = s;
-       parsenleft = len;
+       cmdp = *lastcmdentry;
+       *lastcmdentry = cmdp->next;
+       if (cmdp->cmdtype == CMDFUNCTION)
+               freefunc(cmdp->param.func);
+       free(cmdp);
        INT_ON;
 }
 
+/*
+ * Add a new command entry, replacing any existing command entry for
+ * the same name - except special builtins.
+ */
 static void
-popstring(void)
+addcmdentry(char *name, struct cmdentry *entry)
 {
-       struct strpush *sp = parsefile->strpush;
+       struct tblentry *cmdp;
 
-       INT_OFF;
-#if ENABLE_ASH_ALIAS
-       if (sp->ap) {
-               if (parsenextc[-1] == ' ' || parsenextc[-1] == '\t') {
-                       checkkwd |= CHKALIAS;
-               }
-               if (sp->string != sp->ap->val) {
-                       free(sp->string);
-               }
-               sp->ap->flag &= ~ALIASINUSE;
-               if (sp->ap->flag & ALIASDEAD) {
-                       unalias(sp->ap->name);
-               }
+       cmdp = cmdlookup(name, 1);
+       if (cmdp->cmdtype == CMDFUNCTION) {
+               freefunc(cmdp->param.func);
        }
-#endif
-       parsenextc = sp->prevstring;
-       parsenleft = sp->prevnleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
-       parsefile->strpush = sp->prev;
-       if (sp != &(parsefile->basestrpush))
-               free(sp);
-       INT_ON;
+       cmdp->cmdtype = entry->cmdtype;
+       cmdp->param = entry->u;
+       cmdp->rehash = 0;
 }
 
-
-/*
- * Set the input to take input from a file.  If push is set, push the
- * old input onto the stack first.
- */
 static int
-setinputfile(const char *fname, int flags)
+hashcmd(int argc, char **argv)
 {
-       int fd;
-       int fd2;
+       struct tblentry **pp;
+       struct tblentry *cmdp;
+       int c;
+       struct cmdentry entry;
+       char *name;
 
-       INT_OFF;
-       fd = open(fname, O_RDONLY);
-       if (fd < 0) {
-               if (flags & INPUT_NOFILE_OK)
-                       goto out;
-               ash_msg_and_raise_error("Can't open %s", fname);
+       while ((c = nextopt("r")) != '\0') {
+               clearcmdentry(0);
+               return 0;
        }
-       if (fd < 10) {
-               fd2 = copyfd(fd, 10);
-               close(fd);
-               if (fd2 < 0)
-                       ash_msg_and_raise_error("Out of file descriptors");
-               fd = fd2;
+       if (*argptr == NULL) {
+               for (pp = cmdtable; pp < &cmdtable[CMDTABLESIZE]; pp++) {
+                       for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
+                               if (cmdp->cmdtype == CMDNORMAL)
+                                       printentry(cmdp);
+                       }
+               }
+               return 0;
        }
-       setinputfd(fd, flags & INPUT_PUSH_FILE);
- out:
-       INT_ON;
-       return fd;
-}
-
-
-/*
- * Like setinputfile, but takes an open file descriptor.  Call this with
- * interrupts off.
- */
-static void
-setinputfd(int fd, int push)
-{
-       (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
-       if (push) {
-               pushfile();
-               parsefile->buf = 0;
+       c = 0;
+       while ((name = *argptr) != NULL) {
+               cmdp = cmdlookup(name, 0);
+               if (cmdp != NULL
+                && (cmdp->cmdtype == CMDNORMAL
+                    || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
+                       delete_cmd_entry();
+               find_command(name, &entry, DO_ERR, pathval());
+               if (entry.cmdtype == CMDUNKNOWN)
+                       c = 1;
+               argptr++;
        }
-       parsefile->fd = fd;
-       if (parsefile->buf == NULL)
-               parsefile->buf = ckmalloc(IBUFSIZ);
-       parselleft = parsenleft = 0;
-       plinno = 1;
+       return c;
 }
 
-
 /*
- * Like setinputfile, but takes input from a string.
+ * Called when a cd is done.  Marks all commands so the next time they
+ * are executed they will be rehashed.
  */
 static void
-setinputstring(char *string)
+hashcd(void)
 {
-       INT_OFF;
-       pushfile();
-       parsenextc = string;
-       parsenleft = strlen(string);
-       parsefile->buf = NULL;
-       plinno = 1;
-       INT_ON;
-}
+       struct tblentry **pp;
+       struct tblentry *cmdp;
 
+       for (pp = cmdtable; pp < &cmdtable[CMDTABLESIZE]; pp++) {
+               for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
+                       if (cmdp->cmdtype == CMDNORMAL || (
+                               cmdp->cmdtype == CMDBUILTIN &&
+                               !(IS_BUILTIN_REGULAR(cmdp->param.cmd)) &&
+                               builtinloc > 0
+                       ))
+                               cmdp->rehash = 1;
+               }
+       }
+}
 
 /*
- * To handle the "." command, a stack of input files is used.  Pushfile
- * adds a new entry to the stack and popfile restores the previous level.
+ * Fix command hash table when PATH changed.
+ * Called before PATH is changed.  The argument is the new value of PATH;
+ * pathval() still returns the old value at this point.
+ * Called with interrupts off.
  */
 static void
-pushfile(void)
+changepath(const char *newval)
 {
-       struct parsefile *pf;
-
-       parsefile->nleft = parsenleft;
-       parsefile->lleft = parselleft;
-       parsefile->nextc = parsenextc;
-       parsefile->linno = plinno;
-       pf = ckmalloc(sizeof(*pf));
-       pf->prev = parsefile;
-       pf->fd = -1;
-       pf->strpush = NULL;
-       pf->basestrpush.prev = NULL;
-       parsefile = pf;
-}
+       const char *old, *new;
+       int idx;
+       int firstchange;
+       int idx_bltin;
 
+       old = pathval();
+       new = newval;
+       firstchange = 9999;     /* assume no change */
+       idx = 0;
+       idx_bltin = -1;
+       for (;;) {
+               if (*old != *new) {
+                       firstchange = idx;
+                       if ((*old == '\0' && *new == ':')
+                        || (*old == ':' && *new == '\0'))
+                               firstchange++;
+                       old = new;      /* ignore subsequent differences */
+               }
+               if (*new == '\0')
+                       break;
+               if (*new == '%' && idx_bltin < 0 && prefix(new + 1, "builtin"))
+                       idx_bltin = idx;
+               if (*new == ':') {
+                       idx++;
+               }
+               new++, old++;
+       }
+       if (builtinloc < 0 && idx_bltin >= 0)
+               builtinloc = idx_bltin;             /* zap builtins */
+       if (builtinloc >= 0 && idx_bltin < 0)
+               firstchange = 0;
+       clearcmdentry(firstchange);
+       builtinloc = idx_bltin;
+}
 
-static void
-popfile(void)
+#define TEOF 0
+#define TNL 1
+#define TREDIR 2
+#define TWORD 3
+#define TSEMI 4
+#define TBACKGND 5
+#define TAND 6
+#define TOR 7
+#define TPIPE 8
+#define TLP 9
+#define TRP 10
+#define TENDCASE 11
+#define TENDBQUOTE 12
+#define TNOT 13
+#define TCASE 14
+#define TDO 15
+#define TDONE 16
+#define TELIF 17
+#define TELSE 18
+#define TESAC 19
+#define TFI 20
+#define TFOR 21
+#define TIF 22
+#define TIN 23
+#define TTHEN 24
+#define TUNTIL 25
+#define TWHILE 26
+#define TBEGIN 27
+#define TEND 28
+
+/* first char is indicating which tokens mark the end of a list */
+static const char *const tokname_array[] = {
+       "\1end of file",
+       "\0newline",
+       "\0redirection",
+       "\0word",
+       "\0;",
+       "\0&",
+       "\0&&",
+       "\0||",
+       "\0|",
+       "\0(",
+       "\1)",
+       "\1;;",
+       "\1`",
+#define KWDOFFSET 13
+       /* the following are keywords */
+       "\0!",
+       "\0case",
+       "\1do",
+       "\1done",
+       "\1elif",
+       "\1else",
+       "\1esac",
+       "\1fi",
+       "\0for",
+       "\0if",
+       "\0in",
+       "\1then",
+       "\0until",
+       "\0while",
+       "\0{",
+       "\1}",
+};
+
+static const char *
+tokname(int tok)
 {
-       struct parsefile *pf = parsefile;
+       static char buf[16];
 
-       INT_OFF;
-       if (pf->fd >= 0)
-               close(pf->fd);
-       if (pf->buf)
-               free(pf->buf);
-       while (pf->strpush)
-               popstring();
-       parsefile = pf->prev;
-       free(pf);
-       parsenleft = parsefile->nleft;
-       parselleft = parsefile->lleft;
-       parsenextc = parsefile->nextc;
-       plinno = parsefile->linno;
-       INT_ON;
-}
+//try this:
+//if (tok < TSEMI) return tokname_array[tok] + 1;
+//sprintf(buf, "\"%s\"", tokname_array[tok] + 1);
+//return buf;
 
+       if (tok >= TSEMI)
+               buf[0] = '"';
+       sprintf(buf + (tok >= TSEMI), "%s%c",
+                       tokname_array[tok] + 1, (tok >= TSEMI ? '"' : 0));
+       return buf;
+}
 
-/*
- * Return to top level.
- */
-static void
-popallfiles(void)
+/* Wrapper around strcmp for qsort/bsearch/... */
+static int
+pstrcmp(const void *a, const void *b)
 {
-       while (parsefile != &basepf)
-               popfile();
+       return strcmp((char*) a, (*(char**) b) + 1);
 }
 
+static const char *const *
+findkwd(const char *s)
+{
+       return bsearch(s, tokname_array + KWDOFFSET,
+                       ARRAY_SIZE(tokname_array) - KWDOFFSET,
+                       sizeof(tokname_array[0]), pstrcmp);
+}
 
 /*
- * Close the file(s) that the shell is reading commands from.  Called
- * after a fork is done.
+ * Locate and print what a word is...
  */
-static void
-closescript(void)
+static int
+describe_command(char *command, int describe_command_verbose)
 {
-       popallfiles();
-       if (parsefile->fd > 0) {
-               close(parsefile->fd);
-               parsefile->fd = 0;
-       }
-}
-
-/*      jobs.c    */
+       struct cmdentry entry;
+       struct tblentry *cmdp;
+#if ENABLE_ASH_ALIAS
+       const struct alias *ap;
+#endif
+       const char *path = pathval();
 
-/* mode flags for set_curjob */
-#define CUR_DELETE 2
-#define CUR_RUNNING 1
-#define CUR_STOPPED 0
+       if (describe_command_verbose) {
+               out1str(command);
+       }
 
-/* mode flags for dowait */
-#define DOWAIT_NORMAL 0
-#define DOWAIT_BLOCK 1
+       /* First look at the keywords */
+       if (findkwd(command)) {
+               out1str(describe_command_verbose ? " is a shell keyword" : command);
+               goto out;
+       }
 
-/* array of jobs */
-static struct job *jobtab;
-/* size of array */
-static unsigned njobs;
-#if JOBS
-/* pgrp of shell on invocation */
-static int initialpgrp;
-static int ttyfd = -1;
+#if ENABLE_ASH_ALIAS
+       /* Then look at the aliases */
+       ap = lookupalias(command, 0);
+       if (ap != NULL) {
+               if (!describe_command_verbose) {
+                       out1str("alias ");
+                       printalias(ap);
+                       return 0;
+               }
+               out1fmt(" is an alias for %s", ap->val);
+               goto out;
+       }
 #endif
-/* current job */
-static struct job *curjob;
-/* number of presumed living untracked jobs */
-static int jobless;
+       /* Then check if it is a tracked alias */
+       cmdp = cmdlookup(command, 0);
+       if (cmdp != NULL) {
+               entry.cmdtype = cmdp->cmdtype;
+               entry.u = cmdp->param;
+       } else {
+               /* Finally use brute force */
+               find_command(command, &entry, DO_ABS, path);
+       }
 
-static void set_curjob(struct job *, unsigned);
-#if JOBS
-static int restartjob(struct job *, int);
-static void xtcsetpgrp(int, pid_t);
-static char *commandtext(union node *);
-static void cmdlist(union node *, int);
-static void cmdtxt(union node *);
-static void cmdputs(const char *);
-static void showpipe(struct job *, FILE *);
-#endif
-static int sprint_status(char *, int, int);
-static void freejob(struct job *);
-static struct job *getjob(const char *, int);
-static struct job *growjobtab(void);
-static void forkchild(struct job *, union node *, int);
-static void forkparent(struct job *, union node *, int, pid_t);
-static int dowait(int, struct job *);
-static int getstatus(struct job *);
+       switch (entry.cmdtype) {
+       case CMDNORMAL: {
+               int j = entry.u.index;
+               char *p;
+               if (j == -1) {
+                       p = command;
+               } else {
+                       do {
+                               p = padvance(&path, command);
+                               stunalloc(p);
+                       } while (--j >= 0);
+               }
+               if (describe_command_verbose) {
+                       out1fmt(" is%s %s",
+                               (cmdp ? " a tracked alias for" : nullstr), p
+                       );
+               } else {
+                       out1str(p);
+               }
+               break;
+       }
 
-static void
-set_curjob(struct job *jp, unsigned mode)
-{
-       struct job *jp1;
-       struct job **jpp, **curp;
+       case CMDFUNCTION:
+               if (describe_command_verbose) {
+                       out1str(" is a shell function");
+               } else {
+                       out1str(command);
+               }
+               break;
 
-       /* first remove from list */
-       jpp = curp = &curjob;
-       do {
-               jp1 = *jpp;
-               if (jp1 == jp)
-                       break;
-               jpp = &jp1->prev_job;
-       } while (1);
-       *jpp = jp1->prev_job;
+       case CMDBUILTIN:
+               if (describe_command_verbose) {
+                       out1fmt(" is a %sshell builtin",
+                               IS_BUILTIN_SPECIAL(entry.u.cmd) ?
+                                       "special " : nullstr
+                       );
+               } else {
+                       out1str(command);
+               }
+               break;
 
-       /* Then re-insert in correct position */
-       jpp = curp;
-       switch (mode) {
        default:
-#if DEBUG
-               abort();
-#endif
-       case CUR_DELETE:
-               /* job being deleted */
-               break;
-       case CUR_RUNNING:
-               /* newly created job or backgrounded job,
-                  put after all stopped jobs. */
-               do {
-                       jp1 = *jpp;
-#if JOBS
-                       if (!jp1 || jp1->state != JOBSTOPPED)
-#endif
-                               break;
-                       jpp = &jp1->prev_job;
-               } while (1);
-               /* FALLTHROUGH */
-#if JOBS
-       case CUR_STOPPED:
-#endif
-               /* newly stopped job - becomes curjob */
-               jp->prev_job = *jpp;
-               *jpp = jp;
-               break;
+               if (describe_command_verbose) {
+                       out1str(": not found\n");
+               }
+               return 127;
        }
+ out:
+       outstr("\n", stdout);
+       return 0;
 }
 
-#if JOBS
-/*
- * Turn job control on and off.
- *
- * Note:  This code assumes that the third arg to ioctl is a character
- * pointer, which is true on Berkeley systems but not System V.  Since
- * System V doesn't have job control yet, this isn't a problem now.
- *
- * Called with interrupts off.
- */
-static void
-setjobctl(int on)
+static int
+typecmd(int argc, char **argv)
 {
-       int fd;
-       int pgrp;
-
-       if (on == jobctl || rootshell == 0)
-               return;
-       if (on) {
-               int ofd;
-               ofd = fd = open(_PATH_TTY, O_RDWR);
-               if (fd < 0) {
-       /* BTW, bash will try to open(ttyname(0)) if open("/dev/tty") fails.
-        * That sometimes helps to acquire controlling tty.
-        * Obviously, a workaround for bugs when someone
-        * failed to provide a controlling tty to bash! :) */
-                       fd += 3;
-                       while (!isatty(fd) && --fd >= 0)
-                               ;
-               }
-               fd = fcntl(fd, F_DUPFD, 10);
-               close(ofd);
-               if (fd < 0)
-                       goto out;
-               fcntl(fd, F_SETFD, FD_CLOEXEC);
-               do { /* while we are in the background */
-                       pgrp = tcgetpgrp(fd);
-                       if (pgrp < 0) {
- out:
-                               ash_msg("can't access tty; job control turned off");
-                               mflag = on = 0;
-                               goto close;
-                       }
-                       if (pgrp == getpgrp())
-                               break;
-                       killpg(0, SIGTTIN);
-               } while (1);
-               initialpgrp = pgrp;
+       int i = 1;
+       int err = 0;
+       int verbose = 1;
 
-               setsignal(SIGTSTP);
-               setsignal(SIGTTOU);
-               setsignal(SIGTTIN);
-               pgrp = rootpid;
-               setpgid(0, pgrp);
-               xtcsetpgrp(fd, pgrp);
-       } else {
-               /* turning job control off */
-               fd = ttyfd;
-               pgrp = initialpgrp;
-               xtcsetpgrp(fd, pgrp);
-               setpgid(0, pgrp);
-               setsignal(SIGTSTP);
-               setsignal(SIGTTOU);
-               setsignal(SIGTTIN);
- close:
-               close(fd);
-               fd = -1;
+       /* type -p ... ? (we don't bother checking for 'p') */
+       if (argv[1] && argv[1][0] == '-') {
+               i++;
+               verbose = 0;
        }
-       ttyfd = fd;
-       jobctl = on;
+       while (i < argc) {
+               err |= describe_command(argv[i++], verbose);
+       }
+       return err;
 }
 
+#if ENABLE_ASH_CMDCMD
 static int
-killcmd(int argc, char **argv)
+commandcmd(int argc, char **argv)
 {
-       int signo = -1;
-       int list = 0;
-       int i;
-       pid_t pid;
-       struct job *jp;
-
-       if (argc <= 1) {
- usage:
-               ash_msg_and_raise_error(
-"Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n"
-"kill -l [exitstatus]"
-               );
-       }
-
-       if (**++argv == '-') {
-               signo = get_signum(*argv + 1);
-               if (signo < 0) {
-                       int c;
+       int c;
+       enum {
+               VERIFY_BRIEF = 1,
+               VERIFY_VERBOSE = 2,
+       } verify = 0;
 
-                       while ((c = nextopt("ls:")) != '\0')
-                               switch (c) {
-                               default:
+       while ((c = nextopt("pvV")) != '\0')
+               if (c == 'V')
+                       verify |= VERIFY_VERBOSE;
+               else if (c == 'v')
+                       verify |= VERIFY_BRIEF;
 #if DEBUG
-                                       abort();
+               else if (c != 'p')
+                       abort();
 #endif
-                               case 'l':
-                                       list = 1;
-                                       break;
-                               case 's':
-                                       signo = get_signum(optionarg);
-                                       if (signo < 0) {
-                                               ash_msg_and_raise_error(
-                                                       "invalid signal number or name: %s",
-                                                       optionarg
-                                               );
-                                       }
-                                       break;
-                               }
-                       argv = argptr;
-               } else
-                       argv++;
-       }
-
-       if (!list && signo < 0)
-               signo = SIGTERM;
-
-       if ((signo < 0 || !*argv) ^ list) {
-               goto usage;
-       }
+       if (verify)
+               return describe_command(*argptr, verify - VERIFY_BRIEF);
 
-       if (list) {
-               const char *name;
+       return 0;
+}
+#endif
 
-               if (!*argv) {
-                       for (i = 1; i < NSIG; i++) {
-                               name = get_signame(i);
-                               if (isdigit(*name))
-                                       out1fmt(snlfmt, name);
-                       }
-                       return 0;
-               }
-               name = get_signame(signo);
-               if (!isdigit(*name))
-                       ash_msg_and_raise_error("invalid signal number or exit status: %s", *argptr);
-               out1fmt(snlfmt, name);
-               return 0;
-       }
 
-       i = 0;
-       do {
-               if (**argv == '%') {
-                       jp = getjob(*argv, 0);
-                       pid = -jp->ps[0].pid;
-               } else {
-                       pid = **argv == '-' ?
-                               -number(*argv + 1) : number(*argv);
-               }
-               if (kill(pid, signo) != 0) {
-                       ash_msg("(%d) - %m", pid);
-                       i = 1;
-               }
-       } while (*++argv);
+/* ============ eval.c */
 
-       return i;
-}
-#endif /* JOBS */
+static int funcblocksize;          /* size of structures in function */
+static int funcstringsize;         /* size of strings in node */
+static void *funcblock;            /* block to allocate function from */
+static char *funcstring;           /* block to allocate strings from */
 
-#if JOBS || DEBUG
-static int
-jobno(const struct job *jp)
-{
-       return jp - jobtab + 1;
-}
-#endif
+/* flags in argument to evaltree */
+#define EV_EXIT 01              /* exit after evaluating tree */
+#define EV_TESTED 02            /* exit status is checked; ignore -e flag */
+#define EV_BACKCMD 04           /* command executing within back quotes */
 
-#if JOBS
-static int
-fg_bgcmd(int argc, char **argv)
-{
-       struct job *jp;
-       FILE *out;
-       int mode;
-       int retval;
+static const short nodesize[26] = {
+       SHELL_ALIGN(sizeof(struct ncmd)),
+       SHELL_ALIGN(sizeof(struct npipe)),
+       SHELL_ALIGN(sizeof(struct nredir)),
+       SHELL_ALIGN(sizeof(struct nredir)),
+       SHELL_ALIGN(sizeof(struct nredir)),
+       SHELL_ALIGN(sizeof(struct nbinary)),
+       SHELL_ALIGN(sizeof(struct nbinary)),
+       SHELL_ALIGN(sizeof(struct nbinary)),
+       SHELL_ALIGN(sizeof(struct nif)),
+       SHELL_ALIGN(sizeof(struct nbinary)),
+       SHELL_ALIGN(sizeof(struct nbinary)),
+       SHELL_ALIGN(sizeof(struct nfor)),
+       SHELL_ALIGN(sizeof(struct ncase)),
+       SHELL_ALIGN(sizeof(struct nclist)),
+       SHELL_ALIGN(sizeof(struct narg)),
+       SHELL_ALIGN(sizeof(struct narg)),
+       SHELL_ALIGN(sizeof(struct nfile)),
+       SHELL_ALIGN(sizeof(struct nfile)),
+       SHELL_ALIGN(sizeof(struct nfile)),
+       SHELL_ALIGN(sizeof(struct nfile)),
+       SHELL_ALIGN(sizeof(struct nfile)),
+       SHELL_ALIGN(sizeof(struct ndup)),
+       SHELL_ALIGN(sizeof(struct ndup)),
+       SHELL_ALIGN(sizeof(struct nhere)),
+       SHELL_ALIGN(sizeof(struct nhere)),
+       SHELL_ALIGN(sizeof(struct nnot)),
+};
 
-       mode = (**argv == 'f') ? FORK_FG : FORK_BG;
-       nextopt(nullstr);
-       argv = argptr;
-       out = stdout;
-       do {
-               jp = getjob(*argv, 1);
-               if (mode == FORK_BG) {
-                       set_curjob(jp, CUR_RUNNING);
-                       fprintf(out, "[%d] ", jobno(jp));
-               }
-               outstr(jp->ps->cmd, out);
-               showpipe(jp, out);
-               retval = restartjob(jp, mode);
-       } while (*argv && *++argv);
-       return retval;
-}
+static void calcsize(union node *n);
 
-static int
-restartjob(struct job *jp, int mode)
+static void
+sizenodelist(struct nodelist *lp)
 {
-       struct procstat *ps;
-       int i;
-       int status;
-       pid_t pgid;
-
-       INT_OFF;
-       if (jp->state == JOBDONE)
-               goto out;
-       jp->state = JOBRUNNING;
-       pgid = jp->ps->pid;
-       if (mode == FORK_FG)
-               xtcsetpgrp(ttyfd, pgid);
-       killpg(pgid, SIGCONT);
-       ps = jp->ps;
-       i = jp->nprocs;
-       do {
-               if (WIFSTOPPED(ps->status)) {
-                       ps->status = -1;
-               }
-       } while (ps++, --i);
- out:
-       status = (mode == FORK_FG) ? waitforjob(jp) : 0;
-       INT_ON;
-       return status;
+       while (lp) {
+               funcblocksize += SHELL_ALIGN(sizeof(struct nodelist));
+               calcsize(lp->n);
+               lp = lp->next;
+       }
 }
-#endif
 
-static int
-sprint_status(char *s, int status, int sigonly)
+static void
+calcsize(union node *n)
 {
-       int col;
-       int st;
-
-       col = 0;
-       if (!WIFEXITED(status)) {
-#if JOBS
-               if (WIFSTOPPED(status))
-                       st = WSTOPSIG(status);
-               else
-#endif
-                       st = WTERMSIG(status);
-               if (sigonly) {
-                       if (st == SIGINT || st == SIGPIPE)
-                               goto out;
-#if JOBS
-                       if (WIFSTOPPED(status))
-                               goto out;
-#endif
-               }
-               st &= 0x7f;
-               col = fmtstr(s, 32, strsignal(st));
-               if (WCOREDUMP(status)) {
-                       col += fmtstr(s + col, 16, " (core dumped)");
-               }
-       } else if (!sigonly) {
-               st = WEXITSTATUS(status);
-               if (st)
-                       col = fmtstr(s, 16, "Done(%d)", st);
-               else
-                       col = fmtstr(s, 16, "Done");
-       }
- out:
-       return col;
-}
-
-#if JOBS
-static void
-showjob(FILE *out, struct job *jp, int mode)
-{
-       struct procstat *ps;
-       struct procstat *psend;
-       int col;
-       int indent;
-       char s[80];
-
-       ps = jp->ps;
-
-       if (mode & SHOW_PGID) {
-               /* just output process (group) id of pipeline */
-               fprintf(out, "%d\n", ps->pid);
+       if (n == NULL)
                return;
-       }
-
-       col = fmtstr(s, 16, "[%d]   ", jobno(jp));
-       indent = col;
-
-       if (jp == curjob)
-               s[col - 2] = '+';
-       else if (curjob && jp == curjob->prev_job)
-               s[col - 2] = '-';
-
-       if (mode & SHOW_PID)
-               col += fmtstr(s + col, 16, "%d ", ps->pid);
-
-       psend = ps + jp->nprocs;
-
-       if (jp->state == JOBRUNNING) {
-               strcpy(s + col, "Running");
-               col += sizeof("Running") - 1;
-       } else {
-               int status = psend[-1].status;
-#if JOBS
-               if (jp->state == JOBSTOPPED)
-                       status = jp->stopstatus;
-#endif
-               col += sprint_status(s + col, status, 0);
-       }
-
-       goto start;
-
-       do {
-               /* for each process */
-               col = fmtstr(s, 48, " |\n%*c%d ", indent, ' ', ps->pid) - 3;
- start:
-               fprintf(out, "%s%*c%s",
-                       s, 33 - col >= 0 ? 33 - col : 0, ' ', ps->cmd
-               );
-               if (!(mode & SHOW_PID)) {
-                       showpipe(jp, out);
-                       break;
-               }
-               if (++ps == psend) {
-                       outcslow('\n', out);
-                       break;
-               }
-       } while (1);
-
-       jp->changed = 0;
-
-       if (jp->state == JOBDONE) {
-               TRACE(("showjob: freeing job %d\n", jobno(jp)));
-               freejob(jp);
-       }
+       funcblocksize += nodesize[n->type];
+       switch (n->type) {
+       case NCMD:
+               calcsize(n->ncmd.redirect);
+               calcsize(n->ncmd.args);
+               calcsize(n->ncmd.assign);
+               break;
+       case NPIPE:
+               sizenodelist(n->npipe.cmdlist);
+               break;
+       case NREDIR:
+       case NBACKGND:
+       case NSUBSHELL:
+               calcsize(n->nredir.redirect);
+               calcsize(n->nredir.n);
+               break;
+       case NAND:
+       case NOR:
+       case NSEMI:
+       case NWHILE:
+       case NUNTIL:
+               calcsize(n->nbinary.ch2);
+               calcsize(n->nbinary.ch1);
+               break;
+       case NIF:
+               calcsize(n->nif.elsepart);
+               calcsize(n->nif.ifpart);
+               calcsize(n->nif.test);
+               break;
+       case NFOR:
+               funcstringsize += strlen(n->nfor.var) + 1;
+               calcsize(n->nfor.body);
+               calcsize(n->nfor.args);
+               break;
+       case NCASE:
+               calcsize(n->ncase.cases);
+               calcsize(n->ncase.expr);
+               break;
+       case NCLIST:
+               calcsize(n->nclist.body);
+               calcsize(n->nclist.pattern);
+               calcsize(n->nclist.next);
+               break;
+       case NDEFUN:
+       case NARG:
+               sizenodelist(n->narg.backquote);
+               funcstringsize += strlen(n->narg.text) + 1;
+               calcsize(n->narg.next);
+               break;
+       case NTO:
+       case NCLOBBER:
+       case NFROM:
+       case NFROMTO:
+       case NAPPEND:
+               calcsize(n->nfile.fname);
+               calcsize(n->nfile.next);
+               break;
+       case NTOFD:
+       case NFROMFD:
+               calcsize(n->ndup.vname);
+               calcsize(n->ndup.next);
+       break;
+       case NHERE:
+       case NXHERE:
+               calcsize(n->nhere.doc);
+               calcsize(n->nhere.next);
+               break;
+       case NNOT:
+               calcsize(n->nnot.com);
+               break;
+       };
 }
 
-
-static int
-jobscmd(int argc, char **argv)
+static char *
+nodeckstrdup(char *s)
 {
-       int mode, m;
-       FILE *out;
-
-       mode = 0;
-       while ((m = nextopt("lp"))) {
-               if (m == 'l')
-                       mode = SHOW_PID;
-               else
-                       mode = SHOW_PGID;
-       }
-
-       out = stdout;
-       argv = argptr;
-       if (*argv) {
-               do
-                       showjob(out, getjob(*argv,0), mode);
-               while (*++argv);
-       } else
-               showjobs(out, mode);
+       char *rtn = funcstring;
 
-       return 0;
+       strcpy(funcstring, s);
+       funcstring += strlen(s) + 1;
+       return rtn;
 }
 
+static union node *copynode(union node *);
 
-/*
- * Print a list of jobs.  If "change" is nonzero, only print jobs whose
- * statuses have changed since the last call to showjobs.
- */
-static void
-showjobs(FILE *out, int mode)
+static struct nodelist *
+copynodelist(struct nodelist *lp)
 {
-       struct job *jp;
-
-       TRACE(("showjobs(%x) called\n", mode));
-
-       /* If not even one one job changed, there is nothing to do */
-       while (dowait(DOWAIT_NORMAL, NULL) > 0)
-               continue;
+       struct nodelist *start;
+       struct nodelist **lpp;
 
-       for (jp = curjob; jp; jp = jp->prev_job) {
-               if (!(mode & SHOW_CHANGED) || jp->changed)
-                       showjob(out, jp, mode);
+       lpp = &start;
+       while (lp) {
+               *lpp = funcblock;
+               funcblock = (char *) funcblock + SHELL_ALIGN(sizeof(struct nodelist));
+               (*lpp)->n = copynode(lp->n);
+               lp = lp->next;
+               lpp = &(*lpp)->next;
        }
+       *lpp = NULL;
+       return start;
 }
-#endif /* JOBS */
-
 
-/*
- * Mark a job structure as unused.
- */
-static void
-freejob(struct job *jp)
+static union node *
+copynode(union node *n)
 {
-       struct procstat *ps;
-       int i;
-
-       INT_OFF;
-       for (i = jp->nprocs, ps = jp->ps; --i >= 0; ps++) {
-               if (ps->cmd != nullstr)
-                       free(ps->cmd);
-       }
-       if (jp->ps != &jp->ps0)
-               free(jp->ps);
-       jp->used = 0;
-       set_curjob(jp, CUR_DELETE);
-       INT_ON;
-}
+       union node *new;
 
+       if (n == NULL)
+               return NULL;
+       new = funcblock;
+       funcblock = (char *) funcblock + nodesize[n->type];
 
-static int
-waitcmd(int argc, char **argv)
-{
-       struct job *job;
-       int retval;
-       struct job *jp;
-
-       EXSIGON;
+       switch (n->type) {
+       case NCMD:
+               new->ncmd.redirect = copynode(n->ncmd.redirect);
+               new->ncmd.args = copynode(n->ncmd.args);
+               new->ncmd.assign = copynode(n->ncmd.assign);
+               break;
+       case NPIPE:
+               new->npipe.cmdlist = copynodelist(n->npipe.cmdlist);
+               new->npipe.backgnd = n->npipe.backgnd;
+               break;
+       case NREDIR:
+       case NBACKGND:
+       case NSUBSHELL:
+               new->nredir.redirect = copynode(n->nredir.redirect);
+               new->nredir.n = copynode(n->nredir.n);
+               break;
+       case NAND:
+       case NOR:
+       case NSEMI:
+       case NWHILE:
+       case NUNTIL:
+               new->nbinary.ch2 = copynode(n->nbinary.ch2);
+               new->nbinary.ch1 = copynode(n->nbinary.ch1);
+               break;
+       case NIF:
+               new->nif.elsepart = copynode(n->nif.elsepart);
+               new->nif.ifpart = copynode(n->nif.ifpart);
+               new->nif.test = copynode(n->nif.test);
+               break;
+       case NFOR:
+               new->nfor.var = nodeckstrdup(n->nfor.var);
+               new->nfor.body = copynode(n->nfor.body);
+               new->nfor.args = copynode(n->nfor.args);
+               break;
+       case NCASE:
+               new->ncase.cases = copynode(n->ncase.cases);
+               new->ncase.expr = copynode(n->ncase.expr);
+               break;
+       case NCLIST:
+               new->nclist.body = copynode(n->nclist.body);
+               new->nclist.pattern = copynode(n->nclist.pattern);
+               new->nclist.next = copynode(n->nclist.next);
+               break;
+       case NDEFUN:
+       case NARG:
+               new->narg.backquote = copynodelist(n->narg.backquote);
+               new->narg.text = nodeckstrdup(n->narg.text);
+               new->narg.next = copynode(n->narg.next);
+               break;
+       case NTO:
+       case NCLOBBER:
+       case NFROM:
+       case NFROMTO:
+       case NAPPEND:
+               new->nfile.fname = copynode(n->nfile.fname);
+               new->nfile.fd = n->nfile.fd;
+               new->nfile.next = copynode(n->nfile.next);
+               break;
+       case NTOFD:
+       case NFROMFD:
+               new->ndup.vname = copynode(n->ndup.vname);
+               new->ndup.dupfd = n->ndup.dupfd;
+               new->ndup.fd = n->ndup.fd;
+               new->ndup.next = copynode(n->ndup.next);
+               break;
+       case NHERE:
+       case NXHERE:
+               new->nhere.doc = copynode(n->nhere.doc);
+               new->nhere.fd = n->nhere.fd;
+               new->nhere.next = copynode(n->nhere.next);
+               break;
+       case NNOT:
+               new->nnot.com = copynode(n->nnot.com);
+               break;
+       };
+       new->type = n->type;
+       return new;
+}
 
-       nextopt(nullstr);
-       retval = 0;
+/*
+ * Make a copy of a parse tree.
+ */
+static struct funcnode *
+copyfunc(union node *n)
+{
+       struct funcnode *f;
+       size_t blocksize;
 
-       argv = argptr;
-       if (!*argv) {
-               /* wait for all jobs */
-               for (;;) {
-                       jp = curjob;
-                       while (1) {
-                               if (!jp) {
-                                       /* no running procs */
-                                       goto out;
-                               }
-                               if (jp->state == JOBRUNNING)
-                                       break;
-                               jp->waited = 1;
-                               jp = jp->prev_job;
-                       }
-                       dowait(DOWAIT_BLOCK, 0);
-               }
-       }
+       funcblocksize = offsetof(struct funcnode, n);
+       funcstringsize = 0;
+       calcsize(n);
+       blocksize = funcblocksize;
+       f = ckmalloc(blocksize + funcstringsize);
+       funcblock = (char *) f + offsetof(struct funcnode, n);
+       funcstring = (char *) f + blocksize;
+       copynode(n);
+       f->count = 0;
+       return f;
+}
 
-       retval = 127;
-       do {
-               if (**argv != '%') {
-                       pid_t pid = number(*argv);
-                       job = curjob;
-                       goto start;
-                       do {
-                               if (job->ps[job->nprocs - 1].pid == pid)
-                                       break;
-                               job = job->prev_job;
- start:
-                               if (!job)
-                                       goto repeat;
-                       } while (1);
-               } else
-                       job = getjob(*argv, 0);
-               /* loop until process terminated or stopped */
-               while (job->state == JOBRUNNING)
-                       dowait(DOWAIT_BLOCK, 0);
-               job->waited = 1;
-               retval = getstatus(job);
- repeat:
-               ;
-       } while (*++argv);
+/*
+ * Define a shell function.
+ */
+static void
+defun(char *name, union node *func)
+{
+       struct cmdentry entry;
 
- out:
-       return retval;
+       INT_OFF;
+       entry.cmdtype = CMDFUNCTION;
+       entry.u.func = copyfunc(func);
+       addcmdentry(name, &entry);
+       INT_ON;
 }
 
+static int evalskip;            /* set if we are skipping commands */
+/* reasons for skipping commands (see comment on breakcmd routine) */
+#define SKIPBREAK      (1 << 0)
+#define SKIPCONT       (1 << 1)
+#define SKIPFUNC       (1 << 2)
+#define SKIPFILE       (1 << 3)
+#define SKIPEVAL       (1 << 4)
+static int skipcount;           /* number of levels to skip */
+static int funcnest;            /* depth of function calls */
+
+/* forward decl way out to parsing code - dotrap needs it */
+static int evalstring(char *s, int mask);
 
 /*
- * Convert a job name to a job structure.
+ * Called to execute a trap.  Perhaps we should avoid entering new trap
+ * handlers while we are executing a trap handler.
  */
-static struct job *
-getjob(const char *name, int getctl)
+static int
+dotrap(void)
 {
-       struct job *jp;
-       struct job *found;
-       const char *err_msg = "No such job: %s";
-       unsigned num;
-       int c;
-       const char *p;
-       char *(*match)(const char *, const char *);
-
-       jp = curjob;
-       p = name;
-       if (!p)
-               goto currentjob;
+       char *p;
+       char *q;
+       int i;
+       int savestatus;
+       int skip = 0;
 
-       if (*p != '%')
-               goto err;
+       savestatus = exitstatus;
+       pendingsig = 0;
+       xbarrier();
 
-       c = *++p;
-       if (!c)
-               goto currentjob;
+       for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) {
+               if (!*q)
+                       continue;
+               *q = '\0';
 
-       if (!p[1]) {
-               if (c == '+' || c == '%') {
- currentjob:
-                       err_msg = "No current job";
-                       goto check;
-               }
-               if (c == '-') {
-                       if (jp)
-                               jp = jp->prev_job;
-                       err_msg = "No previous job";
- check:
-                       if (!jp)
-                               goto err;
-                       goto gotit;
-               }
+               p = trap[i + 1];
+               if (!p)
+                       continue;
+               skip = evalstring(p, SKIPEVAL);
+               exitstatus = savestatus;
+               if (skip)
+                       break;
        }
 
-       if (is_number(p)) {
-               num = atoi(p);
-               if (num < njobs) {
-                       jp = jobtab + num - 1;
-                       if (jp->used)
-                               goto gotit;
-                       goto err;
-               }
-       }
-
-       match = prefix;
-       if (*p == '?') {
-               match = strstr;
-               p++;
-       }
-
-       found = 0;
-       while (1) {
-               if (!jp)
-                       goto err;
-               if (match(jp->ps[0].cmd, p)) {
-                       if (found)
-                               goto err;
-                       found = jp;
-                       err_msg = "%s: ambiguous";
-               }
-               jp = jp->prev_job;
-       }
-
- gotit:
-#if JOBS
-       err_msg = "job %s not created under job control";
-       if (getctl && jp->jobctl == 0)
-               goto err;
-#endif
-       return jp;
- err:
-       ash_msg_and_raise_error(err_msg, name);
-}
+       return skip;
+}
 
+/* forward declarations - evaluation is fairly recursive business... */
+static void evalloop(union node *, int);
+static void evalfor(union node *, int);
+static void evalcase(union node *, int);
+static void evalsubshell(union node *, int);
+static void expredir(union node *);
+static void evalpipe(union node *, int);
+static void evalcommand(union node *, int);
+static int evalbltin(const struct builtincmd *, int, char **);
+static void prehash(union node *);
 
 /*
- * Return a new job structure.
- * Called with interrupts off.
+ * Evaluate a parse tree.  The value is left in the global variable
+ * exitstatus.
  */
-static struct job *
-makejob(union node *node, int nprocs)
+static void
+evaltree(union node *n, int flags)
 {
-       int i;
-       struct job *jp;
-
-       for (i = njobs, jp = jobtab; ; jp++) {
-               if (--i < 0) {
-                       jp = growjobtab();
+       int checkexit = 0;
+       void (*evalfn)(union node *, int);
+       unsigned isor;
+       int status;
+       if (n == NULL) {
+               TRACE(("evaltree(NULL) called\n"));
+               goto out;
+       }
+       TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
+                       getpid(), n, n->type, flags));
+       switch (n->type) {
+       default:
+#if DEBUG
+               out1fmt("Node type = %d\n", n->type);
+               fflush(stdout);
+               break;
+#endif
+       case NNOT:
+               evaltree(n->nnot.com, EV_TESTED);
+               status = !exitstatus;
+               goto setstatus;
+       case NREDIR:
+               expredir(n->nredir.redirect);
+               status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
+               if (!status) {
+                       evaltree(n->nredir.n, flags & EV_TESTED);
+                       status = exitstatus;
+               }
+               popredir(0);
+               goto setstatus;
+       case NCMD:
+               evalfn = evalcommand;
+ checkexit:
+               if (eflag && !(flags & EV_TESTED))
+                       checkexit = ~0;
+               goto calleval;
+       case NFOR:
+               evalfn = evalfor;
+               goto calleval;
+       case NWHILE:
+       case NUNTIL:
+               evalfn = evalloop;
+               goto calleval;
+       case NSUBSHELL:
+       case NBACKGND:
+               evalfn = evalsubshell;
+               goto calleval;
+       case NPIPE:
+               evalfn = evalpipe;
+               goto checkexit;
+       case NCASE:
+               evalfn = evalcase;
+               goto calleval;
+       case NAND:
+       case NOR:
+       case NSEMI:
+#if NAND + 1 != NOR
+#error NAND + 1 != NOR
+#endif
+#if NOR + 1 != NSEMI
+#error NOR + 1 != NSEMI
+#endif
+               isor = n->type - NAND;
+               evaltree(
+                       n->nbinary.ch1,
+                       (flags | ((isor >> 1) - 1)) & EV_TESTED
+               );
+               if (!exitstatus == isor)
+                       break;
+               if (!evalskip) {
+                       n = n->nbinary.ch2;
+ evaln:
+                       evalfn = evaltree;
+ calleval:
+                       evalfn(n, flags);
                        break;
                }
-               if (jp->used == 0)
+               break;
+       case NIF:
+               evaltree(n->nif.test, EV_TESTED);
+               if (evalskip)
                        break;
-               if (jp->state != JOBDONE || !jp->waited)
-                       continue;
-#if JOBS
-               if (jobctl)
-                       continue;
-#endif
-               freejob(jp);
+               if (exitstatus == 0) {
+                       n = n->nif.ifpart;
+                       goto evaln;
+               } else if (n->nif.elsepart) {
+                       n = n->nif.elsepart;
+                       goto evaln;
+               }
+               goto success;
+       case NDEFUN:
+               defun(n->narg.text, n->narg.next);
+ success:
+               status = 0;
+ setstatus:
+               exitstatus = status;
                break;
        }
-       memset(jp, 0, sizeof(*jp));
-#if JOBS
-       if (jobctl)
-               jp->jobctl = 1;
-#endif
-       jp->prev_job = curjob;
-       curjob = jp;
-       jp->used = 1;
-       jp->ps = &jp->ps0;
-       if (nprocs > 1) {
-               jp->ps = ckmalloc(nprocs * sizeof(struct procstat));
+ out:
+       if ((checkexit & exitstatus))
+               evalskip |= SKIPEVAL;
+       else if (pendingsig && dotrap())
+               goto exexit;
+
+       if (flags & EV_EXIT) {
+ exexit:
+               raise_exception(EXEXIT);
        }
-       TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
-                               jobno(jp)));
-       return jp;
 }
 
-static struct job *
-growjobtab(void)
-{
-       size_t len;
-       ptrdiff_t offset;
-       struct job *jp, *jq;
+#if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
+static
+#endif
+void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
 
-       len = njobs * sizeof(*jp);
-       jq = jobtab;
-       jp = ckrealloc(jq, len + 4 * sizeof(*jp));
+static int loopnest;            /* current loop nesting level */
 
-       offset = (char *)jp - (char *)jq;
-       if (offset) {
-               /* Relocate pointers */
-               size_t l = len;
+static void
+evalloop(union node *n, int flags)
+{
+       int status;
 
-               jq = (struct job *)((char *)jq + l);
-               while (l) {
-                       l -= sizeof(*jp);
-                       jq--;
-#define joff(p) ((struct job *)((char *)(p) + l))
-#define jmove(p) (p) = (void *)((char *)(p) + offset)
-                       if (xlikely(joff(jp)->ps == &jq->ps0))
-                               jmove(joff(jp)->ps);
-                       if (joff(jp)->prev_job)
-                               jmove(joff(jp)->prev_job);
+       loopnest++;
+       status = 0;
+       flags &= EV_TESTED;
+       for (;;) {
+               int i;
+
+               evaltree(n->nbinary.ch1, EV_TESTED);
+               if (evalskip) {
+ skipping:
+                       if (evalskip == SKIPCONT && --skipcount <= 0) {
+                               evalskip = 0;
+                               continue;
+                       }
+                       if (evalskip == SKIPBREAK && --skipcount <= 0)
+                               evalskip = 0;
+                       break;
                }
-               if (curjob)
-                       jmove(curjob);
-#undef joff
-#undef jmove
+               i = exitstatus;
+               if (n->type != NWHILE)
+                       i = !i;
+               if (i != 0)
+                       break;
+               evaltree(n->nbinary.ch2, flags);
+               status = exitstatus;
+               if (evalskip)
+                       goto skipping;
        }
-
-       njobs += 4;
-       jobtab = jp;
-       jp = (struct job *)((char *)jp + len);
-       jq = jp + 3;
-       do {
-               jq->used = 0;
-       } while (--jq >= jp);
-       return jp;
+       loopnest--;
+       exitstatus = status;
 }
 
-
-/*
- * Fork off a subshell.  If we are doing job control, give the subshell its
- * own process group.  Jp is a job structure that the job is to be added to.
- * N is the command that will be evaluated by the child.  Both jp and n may
- * be NULL.  The mode parameter can be one of the following:
- *      FORK_FG - Fork off a foreground process.
- *      FORK_BG - Fork off a background process.
- *      FORK_NOJOB - Like FORK_FG, but don't give the process its own
- *                   process group even if job control is on.
- *
- * When job control is turned off, background processes have their standard
- * input redirected to /dev/null (except for the second and later processes
- * in a pipeline).
- *
- * Called with interrupts off.
- */
-static void forkchild(struct job *jp, union node *n, int mode)
+static void
+evalfor(union node *n, int flags)
 {
-       int oldlvl;
-
-       TRACE(("Child shell %d\n", getpid()));
-       oldlvl = shlvl;
-       shlvl++;
+       struct arglist arglist;
+       union node *argp;
+       struct strlist *sp;
+       struct stackmark smark;
 
-       closescript();
-       clear_traps();
-#if JOBS
-       /* do job control only in root shell */
-       jobctl = 0;
-       if (mode != FORK_NOJOB && jp->jobctl && !oldlvl) {
-               pid_t pgrp;
+       setstackmark(&smark);
+       arglist.lastp = &arglist.list;
+       for (argp = n->nfor.args; argp; argp = argp->narg.next) {
+               expandarg(argp, &arglist, EXP_FULL | EXP_TILDE | EXP_RECORD);
+               /* XXX */
+               if (evalskip)
+                       goto out;
+       }
+       *arglist.lastp = NULL;
 
-               if (jp->nprocs == 0)
-                       pgrp = getpid();
-               else
-                       pgrp = jp->ps[0].pid;
-               /* This can fail because we are doing it in the parent also */
-               (void)setpgid(0, pgrp);
-               if (mode == FORK_FG)
-                       xtcsetpgrp(ttyfd, pgrp);
-               setsignal(SIGTSTP);
-               setsignal(SIGTTOU);
-       } else
-#endif
-       if (mode == FORK_BG) {
-               ignoresig(SIGINT);
-               ignoresig(SIGQUIT);
-               if (jp->nprocs == 0) {
-                       close(0);
-                       if (open(bb_dev_null, O_RDONLY) != 0)
-                               ash_msg_and_raise_error("Can't open %s", bb_dev_null);
+       exitstatus = 0;
+       loopnest++;
+       flags &= EV_TESTED;
+       for (sp = arglist.list; sp; sp = sp->next) {
+               setvar(n->nfor.var, sp->text, 0);
+               evaltree(n->nfor.body, flags);
+               if (evalskip) {
+                       if (evalskip == SKIPCONT && --skipcount <= 0) {
+                               evalskip = 0;
+                               continue;
+                       }
+                       if (evalskip == SKIPBREAK && --skipcount <= 0)
+                               evalskip = 0;
+                       break;
                }
        }
-       if (!oldlvl && iflag) {
-               setsignal(SIGINT);
-               setsignal(SIGQUIT);
-               setsignal(SIGTERM);
-       }
-       for (jp = curjob; jp; jp = jp->prev_job)
-               freejob(jp);
-       jobless = 0;
+       loopnest--;
+ out:
+       popstackmark(&smark);
 }
 
-static void forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+static void
+evalcase(union node *n, int flags)
 {
-       TRACE(("In parent shell: child = %d\n", pid));
-       if (!jp) {
-               while (jobless && dowait(DOWAIT_NORMAL, 0) > 0);
-               jobless++;
-               return;
-       }
-#if JOBS
-       if (mode != FORK_NOJOB && jp->jobctl) {
-               int pgrp;
+       union node *cp;
+       union node *patp;
+       struct arglist arglist;
+       struct stackmark smark;
 
-               if (jp->nprocs == 0)
-                       pgrp = pid;
-               else
-                       pgrp = jp->ps[0].pid;
-               /* This can fail because we are doing it in the child also */
-               setpgid(pid, pgrp);
-       }
-#endif
-       if (mode == FORK_BG) {
-               backgndpid = pid;               /* set $! */
-               set_curjob(jp, CUR_RUNNING);
-       }
-       if (jp) {
-               struct procstat *ps = &jp->ps[jp->nprocs++];
-               ps->pid = pid;
-               ps->status = -1;
-               ps->cmd = nullstr;
-#if JOBS
-               if (jobctl && n)
-                       ps->cmd = commandtext(n);
-#endif
+       setstackmark(&smark);
+       arglist.lastp = &arglist.list;
+       expandarg(n->ncase.expr, &arglist, EXP_TILDE);
+       exitstatus = 0;
+       for (cp = n->ncase.cases; cp && evalskip == 0; cp = cp->nclist.next) {
+               for (patp = cp->nclist.pattern; patp; patp = patp->narg.next) {
+                       if (casematch(patp, arglist.list->text)) {
+                               if (evalskip == 0) {
+                                       evaltree(cp->nclist.body, flags);
+                               }
+                               goto out;
+                       }
+               }
        }
+ out:
+       popstackmark(&smark);
 }
 
-static int
-forkshell(struct job *jp, union node *n, int mode)
+/*
+ * Kick off a subshell to evaluate a tree.
+ */
+static void
+evalsubshell(union node *n, int flags)
 {
-       int pid;
+       struct job *jp;
+       int backgnd = (n->type == NBACKGND);
+       int status;
 
-       TRACE(("forkshell(%%%d, %p, %d) called\n", jobno(jp), n, mode));
-       pid = fork();
-       if (pid < 0) {
-               TRACE(("Fork failed, errno=%d", errno));
-               if (jp)
-                       freejob(jp);
-               ash_msg_and_raise_error("Cannot fork");
+       expredir(n->nredir.redirect);
+       if (!backgnd && flags & EV_EXIT && !trap[0])
+               goto nofork;
+       INT_OFF;
+       jp = makejob(n, 1);
+       if (forkshell(jp, n, backgnd) == 0) {
+               INT_ON;
+               flags |= EV_EXIT;
+               if (backgnd)
+                       flags &=~ EV_TESTED;
+ nofork:
+               redirect(n->nredir.redirect, 0);
+               evaltreenr(n->nredir.n, flags);
+               /* never returns */
        }
-       if (pid == 0)
-               forkchild(jp, n, mode);
-       else
-               forkparent(jp, n, mode, pid);
-       return pid;
+       status = 0;
+       if (! backgnd)
+               status = waitforjob(jp);
+       exitstatus = status;
+       INT_ON;
 }
 
-
 /*
- * Wait for job to finish.
- *
- * Under job control we have the problem that while a child process is
- * running interrupts generated by the user are sent to the child but not
- * to the shell.  This means that an infinite loop started by an inter-
- * active user may be hard to kill.  With job control turned off, an
- * interactive user may place an interactive program inside a loop.  If
- * the interactive program catches interrupts, the user doesn't want
- * these interrupts to also abort the loop.  The approach we take here
- * is to have the shell ignore interrupt signals while waiting for a
- * foreground process to terminate, and then send itself an interrupt
- * signal if the child process was terminated by an interrupt signal.
- * Unfortunately, some programs want to do a bit of cleanup and then
- * exit on interrupt; unless these processes terminate themselves by
- * sending a signal to themselves (instead of calling exit) they will
- * confuse this approach.
- *
- * Called with interrupts off.
+ * Compute the names of the files in a redirection list.
  */
-static int
-waitforjob(struct job *jp)
+static void fixredir(union node *, const char *, int);
+static void
+expredir(union node *n)
 {
-       int st;
+       union node *redir;
 
-       TRACE(("waitforjob(%%%d) called\n", jobno(jp)));
-       while (jp->state == JOBRUNNING) {
-               dowait(DOWAIT_BLOCK, jp);
-       }
-       st = getstatus(jp);
-#if JOBS
-       if (jp->jobctl) {
-               xtcsetpgrp(ttyfd, rootpid);
-               /*
-                * This is truly gross.
-                * If we're doing job control, then we did a TIOCSPGRP which
-                * caused us (the shell) to no longer be in the controlling
-                * session -- so we wouldn't have seen any ^C/SIGINT.  So, we
-                * intuit from the subprocess exit status whether a SIGINT
-                * occurred, and if so interrupt ourselves.  Yuck.  - mycroft
-                */
-               if (jp->sigint)
-                       raise(SIGINT);
+       for (redir = n; redir; redir = redir->nfile.next) {
+               struct arglist fn;
+
+               memset(&fn, 0, sizeof(fn));
+               fn.lastp = &fn.list;
+               switch (redir->type) {
+               case NFROMTO:
+               case NFROM:
+               case NTO:
+               case NCLOBBER:
+               case NAPPEND:
+                       expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
+                       redir->nfile.expfname = fn.list->text;
+                       break;
+               case NFROMFD:
+               case NTOFD:
+                       if (redir->ndup.vname) {
+                               expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
+                               if (fn.list == NULL)
+                                       ash_msg_and_raise_error("redir error");
+                               fixredir(redir, fn.list->text, 1);
+                       }
+                       break;
+               }
        }
-       if (jp->state == JOBDONE)
-#endif
-               freejob(jp);
-       return st;
 }
 
-
 /*
- * Do a wait system call.  If job control is compiled in, we accept
- * stopped processes.  If block is zero, we return a value of zero
- * rather than blocking.
- *
- * System V doesn't have a non-blocking wait system call.  It does
- * have a SIGCLD signal that is sent to a process when one of it's
- * children dies.  The obvious way to use SIGCLD would be to install
- * a handler for SIGCLD which simply bumped a counter when a SIGCLD
- * was received, and have waitproc bump another counter when it got
- * the status of a process.  Waitproc would then know that a wait
- * system call would not block if the two counters were different.
- * This approach doesn't work because if a process has children that
- * have not been waited for, System V will send it a SIGCLD when it
- * installs a signal handler for SIGCLD.  What this means is that when
- * a child exits, the shell will be sent SIGCLD signals continuously
- * until is runs out of stack space, unless it does a wait call before
- * restoring the signal handler.  The code below takes advantage of
- * this (mis)feature by installing a signal handler for SIGCLD and
- * then checking to see whether it was called.  If there are any
- * children to be waited for, it will be.
- *
- * If neither SYSV nor BSD is defined, we don't implement nonblocking
- * waits at all.  In this case, the user will not be informed when
- * a background process until the next time she runs a real program
- * (as opposed to running a builtin command or just typing return),
- * and the jobs command may give out of date information.
+ * Evaluate a pipeline.  All the processes in the pipeline are children
+ * of the process creating the pipeline.  (This differs from some versions
+ * of the shell, which make the last process in a pipeline the parent
+ * of all the rest.)
  */
-static int
-waitproc(int block, int *status)
+static void
+evalpipe(union node *n, int flags)
 {
-       int flags = 0;
-
-#if JOBS
-       if (jobctl)
-               flags |= WUNTRACED;
-#endif
-       if (block == 0)
-               flags |= WNOHANG;
-       return wait3(status, flags, (struct rusage *)NULL);
-}
-
-
-/*
- * Wait for a process to terminate.
- */
-static int
-dowait(int block, struct job *job)
-{
-       int pid;
-       int status;
        struct job *jp;
-       struct job *thisjob;
-       int state;
+       struct nodelist *lp;
+       int pipelen;
+       int prevfd;
+       int pip[2];
 
-       TRACE(("dowait(%d) called\n", block));
-       pid = waitproc(block, &status);
-       TRACE(("wait returns pid %d, status=%d\n", pid, status));
-       if (pid <= 0)
-               return pid;
+       TRACE(("evalpipe(0x%lx) called\n", (long)n));
+       pipelen = 0;
+       for (lp = n->npipe.cmdlist; lp; lp = lp->next)
+               pipelen++;
+       flags |= EV_EXIT;
        INT_OFF;
-       thisjob = NULL;
-       for (jp = curjob; jp; jp = jp->prev_job) {
-               struct procstat *sp;
-               struct procstat *spend;
-               if (jp->state == JOBDONE)
-                       continue;
-               state = JOBDONE;
-               spend = jp->ps + jp->nprocs;
-               sp = jp->ps;
-               do {
-                       if (sp->pid == pid) {
-                               TRACE(("Job %d: changing status of proc %d "
-                                       "from 0x%x to 0x%x\n",
-                                       jobno(jp), pid, sp->status, status));
-                               sp->status = status;
-                               thisjob = jp;
+       jp = makejob(n, pipelen);
+       prevfd = -1;
+       for (lp = n->npipe.cmdlist; lp; lp = lp->next) {
+               prehash(lp->n);
+               pip[1] = -1;
+               if (lp->next) {
+                       if (pipe(pip) < 0) {
+                               close(prevfd);
+                               ash_msg_and_raise_error("pipe call failed");
                        }
-                       if (sp->status == -1)
-                               state = JOBRUNNING;
-#if JOBS
-                       if (state == JOBRUNNING)
-                               continue;
-                       if (WIFSTOPPED(sp->status)) {
-                               jp->stopstatus = sp->status;
-                               state = JOBSTOPPED;
+               }
+               if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) {
+                       INT_ON;
+                       if (pip[1] >= 0) {
+                               close(pip[0]);
                        }
-#endif
-               } while (++sp < spend);
-               if (thisjob)
-                       goto gotjob;
-       }
-#if JOBS
-       if (!WIFSTOPPED(status))
-#endif
-
-               jobless--;
-       goto out;
-
- gotjob:
-       if (state != JOBRUNNING) {
-               thisjob->changed = 1;
-
-               if (thisjob->state != state) {
-                       TRACE(("Job %d: changing state from %d to %d\n",
-                               jobno(thisjob), thisjob->state, state));
-                       thisjob->state = state;
-#if JOBS
-                       if (state == JOBSTOPPED) {
-                               set_curjob(thisjob, CUR_STOPPED);
+                       if (prevfd > 0) {
+                               dup2(prevfd, 0);
+                               close(prevfd);
                        }
-#endif
+                       if (pip[1] > 1) {
+                               dup2(pip[1], 1);
+                               close(pip[1]);
+                       }
+                       evaltreenr(lp->n, flags);
+                       /* never returns */
                }
+               if (prevfd >= 0)
+                       close(prevfd);
+               prevfd = pip[0];
+               close(pip[1]);
        }
-
- out:
-       INT_ON;
-
-       if (thisjob && thisjob == job) {
-               char s[48 + 1];
-               int len;
-
-               len = sprint_status(s, status, 1);
-               if (len) {
-                       s[len] = '\n';
-                       s[len + 1] = 0;
-                       out2str(s);
-               }
+       if (n->npipe.backgnd == 0) {
+               exitstatus = waitforjob(jp);
+               TRACE(("evalpipe:  job done exit status %d\n", exitstatus));
        }
-       return pid;
+       INT_ON;
 }
 
-
 /*
- * return 1 if there are stopped jobs, otherwise 0
+ * Controls whether the shell is interactive or not.
  */
-int
-stoppedjobs(void)
+static void
+setinteractive(int on)
 {
-       struct job *jp;
-       int retval;
+       static int is_interactive;
 
-       retval = 0;
-       if (job_warning)
-               goto out;
-       jp = curjob;
-       if (jp && jp->state == JOBSTOPPED) {
-               out2str("You have stopped jobs.\n");
-               job_warning = 2;
-               retval++;
+       if (++on == is_interactive)
+               return;
+       is_interactive = on;
+       setsignal(SIGINT);
+       setsignal(SIGQUIT);
+       setsignal(SIGTERM);
+#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+       if (is_interactive > 1) {
+               /* Looks like they want an interactive shell */
+               static smallint did_banner;
+
+               if (!did_banner) {
+                       out1fmt(
+                               "\n\n"
+                               "%s built-in shell (ash)\n"
+                               "Enter 'help' for a list of built-in commands."
+                               "\n\n",
+                               bb_banner);
+                       did_banner = 1;
+               }
        }
+#endif
+}
 
-out:
-       return retval;
+#if ENABLE_FEATURE_EDITING_VI
+#define setvimode(on) do { \
+       if (on) line_input_state->flags |= VI_MODE; \
+       else line_input_state->flags &= ~VI_MODE; \
+} while (0)
+#else
+#define setvimode(on) viflag = 0   /* forcibly keep the option off */
+#endif
+
+static void
+optschanged(void)
+{
+#if DEBUG
+       opentrace();
+#endif
+       setinteractive(iflag);
+       setjobctl(mflag);
+       setvimode(viflag);
 }
 
+static struct localvar *localvars;
+
 /*
- * Return a string identifying a command (to be printed by the
- * jobs command).
+ * Called after a function returns.
+ * Interrupts must be off.
  */
-#if JOBS
-static char *cmdnextc;
-
-static char *
-commandtext(union node *n)
+static void
+poplocalvars(void)
 {
-       char *name;
+       struct localvar *lvp;
+       struct var *vp;
 
-       STARTSTACKSTR(cmdnextc);
-       cmdtxt(n);
-       name = stackblock();
-       TRACE(("commandtext: name %p, end %p\n\t\"%s\"\n",
-               name, cmdnextc, cmdnextc));
-       return ckstrdup(name);
+       while ((lvp = localvars) != NULL) {
+               localvars = lvp->next;
+               vp = lvp->vp;
+               TRACE(("poplocalvar %s", vp ? vp->text : "-"));
+               if (vp == NULL) {       /* $- saved */
+                       memcpy(optlist, lvp->text, sizeof(optlist));
+                       free((char*)lvp->text);
+                       optschanged();
+               } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
+                       unsetvar(vp->text);
+               } else {
+                       if (vp->func)
+                               (*vp->func)(strchrnul(lvp->text, '=') + 1);
+                       if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
+                               free((char*)vp->text);
+                       vp->flags = lvp->flags;
+                       vp->text = lvp->text;
+               }
+               free(lvp);
+       }
 }
 
-static void
-cmdtxt(union node *n)
+static int
+evalfun(struct funcnode *func, int argc, char **argv, int flags)
 {
-       union node *np;
-       struct nodelist *lp;
-       const char *p;
-       char s[2];
+       volatile struct shparam saveparam;
+       struct localvar *volatile savelocalvars;
+       struct jmploc *volatile savehandler;
+       struct jmploc jmploc;
+       int e;
 
-       if (!n)
-               return;
-       switch (n->type) {
-       default:
-#if DEBUG
-               abort();
-#endif
-       case NPIPE:
-               lp = n->npipe.cmdlist;
-               for (;;) {
-                       cmdtxt(lp->n);
-                       lp = lp->next;
-                       if (!lp)
-                               break;
-                       cmdputs(" | ");
-               }
-               break;
-       case NSEMI:
-               p = "; ";
-               goto binop;
-       case NAND:
-               p = " && ";
-               goto binop;
-       case NOR:
-               p = " || ";
- binop:
-               cmdtxt(n->nbinary.ch1);
-               cmdputs(p);
-               n = n->nbinary.ch2;
-               goto donode;
-       case NREDIR:
-       case NBACKGND:
-               n = n->nredir.n;
-               goto donode;
-       case NNOT:
-               cmdputs("!");
-               n = n->nnot.com;
- donode:
-               cmdtxt(n);
-               break;
-       case NIF:
-               cmdputs("if ");
-               cmdtxt(n->nif.test);
-               cmdputs("; then ");
-               n = n->nif.ifpart;
-               if (n->nif.elsepart) {
-                       cmdtxt(n);
-                       cmdputs("; else ");
-                       n = n->nif.elsepart;
-               }
-               p = "; fi";
-               goto dotail;
-       case NSUBSHELL:
-               cmdputs("(");
-               n = n->nredir.n;
-               p = ")";
-               goto dotail;
-       case NWHILE:
-               p = "while ";
-               goto until;
-       case NUNTIL:
-               p = "until ";
- until:
-               cmdputs(p);
-               cmdtxt(n->nbinary.ch1);
-               n = n->nbinary.ch2;
-               p = "; done";
- dodo:
-               cmdputs("; do ");
- dotail:
-               cmdtxt(n);
-               goto dotail2;
-       case NFOR:
-               cmdputs("for ");
-               cmdputs(n->nfor.var);
-               cmdputs(" in ");
-               cmdlist(n->nfor.args, 1);
-               n = n->nfor.body;
-               p = "; done";
-               goto dodo;
-       case NDEFUN:
-               cmdputs(n->narg.text);
-               p = "() { ... }";
-               goto dotail2;
-       case NCMD:
-               cmdlist(n->ncmd.args, 1);
-               cmdlist(n->ncmd.redirect, 0);
-               break;
-       case NARG:
-               p = n->narg.text;
- dotail2:
-               cmdputs(p);
-               break;
-       case NHERE:
-       case NXHERE:
-               p = "<<...";
-               goto dotail2;
-       case NCASE:
-               cmdputs("case ");
-               cmdputs(n->ncase.expr->narg.text);
-               cmdputs(" in ");
-               for (np = n->ncase.cases; np; np = np->nclist.next) {
-                       cmdtxt(np->nclist.pattern);
-                       cmdputs(") ");
-                       cmdtxt(np->nclist.body);
-                       cmdputs(";; ");
-               }
-               p = "esac";
-               goto dotail2;
-       case NTO:
-               p = ">";
-               goto redir;
-       case NCLOBBER:
-               p = ">|";
-               goto redir;
-       case NAPPEND:
-               p = ">>";
-               goto redir;
-       case NTOFD:
-               p = ">&";
-               goto redir;
-       case NFROM:
-               p = "<";
-               goto redir;
-       case NFROMFD:
-               p = "<&";
-               goto redir;
-       case NFROMTO:
-               p = "<>";
- redir:
-               s[0] = n->nfile.fd + '0';
-               s[1] = '\0';
-               cmdputs(s);
-               cmdputs(p);
-               if (n->type == NTOFD || n->type == NFROMFD) {
-                       s[0] = n->ndup.dupfd + '0';
-                       p = s;
-                       goto dotail2;
-               }
-               n = n->nfile.fname;
-               goto donode;
+       saveparam = shellparam;
+       savelocalvars = localvars;
+       e = setjmp(jmploc.loc);
+       if (e) {
+               goto funcdone;
        }
+       INT_OFF;
+       savehandler = exception_handler;
+       exception_handler = &jmploc;
+       localvars = NULL;
+       shellparam.malloc = 0;
+       func->count++;
+       funcnest++;
+       INT_ON;
+       shellparam.nparam = argc - 1;
+       shellparam.p = argv + 1;
+#if ENABLE_ASH_GETOPTS
+       shellparam.optind = 1;
+       shellparam.optoff = -1;
+#endif
+       evaltree(&func->n, flags & EV_TESTED);
+funcdone:
+       INT_OFF;
+       funcnest--;
+       freefunc(func);
+       poplocalvars();
+       localvars = savelocalvars;
+       freeparam(&shellparam);
+       shellparam = saveparam;
+       exception_handler = savehandler;
+       INT_ON;
+       evalskip &= ~SKIPFUNC;
+       return e;
 }
 
-static void
-cmdlist(union node *np, int sep)
+#if ENABLE_ASH_CMDCMD
+static char **
+parse_command_args(char **argv, const char **path)
 {
-       for (; np; np = np->narg.next) {
-               if (!sep)
-                       cmdputs(spcstr);
-               cmdtxt(np);
-               if (sep && np->narg.next)
-                       cmdputs(spcstr);
+       char *cp, c;
+
+       for (;;) {
+               cp = *++argv;
+               if (!cp)
+                       return 0;
+               if (*cp++ != '-')
+                       break;
+               c = *cp++;
+               if (!c)
+                       break;
+               if (c == '-' && !*cp) {
+                       argv++;
+                       break;
+               }
+               do {
+                       switch (c) {
+                       case 'p':
+                               *path = bb_default_path;
+                               break;
+                       default:
+                               /* run 'typecmd' for other options */
+                               return 0;
+                       }
+                       c = *cp++;
+               } while (c);
        }
+       return argv;
 }
+#endif
 
+/*
+ * Make a variable a local variable.  When a variable is made local, it's
+ * value and flags are saved in a localvar structure.  The saved values
+ * will be restored when the shell function returns.  We handle the name
+ * "-" as a special case.
+ */
 static void
-cmdputs(const char *s)
+mklocal(char *name)
 {
-       const char *p, *str;
-       char c, cc[2] = " ";
-       char *nextc;
-       int subtype = 0;
-       int quoted = 0;
-       static const char vstype[VSTYPE + 1][4] = {
-               "", "}", "-", "+", "?", "=",
-               "%", "%%", "#", "##"
-       };
+       struct localvar *lvp;
+       struct var **vpp;
+       struct var *vp;
 
-       nextc = makestrspace((strlen(s) + 1) * 8, cmdnextc);
-       p = s;
-       while ((c = *p++) != 0) {
-               str = 0;
-               switch (c) {
-               case CTLESC:
-                       c = *p++;
-                       break;
-               case CTLVAR:
-                       subtype = *p++;
-                       if ((subtype & VSTYPE) == VSLENGTH)
-                               str = "${#";
+       INT_OFF;
+       lvp = ckmalloc(sizeof(struct localvar));
+       if (LONE_DASH(name)) {
+               char *p;
+               p = ckmalloc(sizeof(optlist));
+               lvp->text = memcpy(p, optlist, sizeof(optlist));
+               vp = NULL;
+       } else {
+               char *eq;
+
+               vpp = hashvar(name);
+               vp = *findvar(vpp, name);
+               eq = strchr(name, '=');
+               if (vp == NULL) {
+                       if (eq)
+                               setvareq(name, VSTRFIXED);
                        else
-                               str = "${";
-                       if (!(subtype & VSQUOTE) == !(quoted & 1))
-                               goto dostr;
-                       quoted ^= 1;
-                       c = '"';
-                       break;
-               case CTLENDVAR:
-                       str = "\"}" + !(quoted & 1);
-                       quoted >>= 1;
-                       subtype = 0;
-                       goto dostr;
-               case CTLBACKQ:
-                       str = "$(...)";
-                       goto dostr;
-               case CTLBACKQ+CTLQUOTE:
-                       str = "\"$(...)\"";
-                       goto dostr;
-#if ENABLE_ASH_MATH_SUPPORT
-               case CTLARI:
-                       str = "$((";
-                       goto dostr;
-               case CTLENDARI:
-                       str = "))";
-                       goto dostr;
-#endif
-               case CTLQUOTEMARK:
-                       quoted ^= 1;
-                       c = '"';
-                       break;
-               case '=':
-                       if (subtype == 0)
-                               break;
-                       if ((subtype & VSTYPE) != VSNORMAL)
-                               quoted <<= 1;
-                       str = vstype[subtype & VSTYPE];
-                       if (subtype & VSNUL)
-                               c = ':';
-                       else
-                               goto checkstr;
-                       break;
-               case '\'':
-               case '\\':
-               case '"':
-               case '$':
-                       /* These can only happen inside quotes */
-                       cc[0] = c;
-                       str = cc;
-                       c = '\\';
-                       break;
-               default:
-                       break;
-               }
-               USTPUTC(c, nextc);
- checkstr:
-               if (!str)
-                       continue;
- dostr:
-               while ((c = *str++)) {
-                       USTPUTC(c, nextc);
+                               setvar(name, NULL, VSTRFIXED);
+                       vp = *vpp;      /* the new variable */
+                       lvp->flags = VUNSET;
+               } else {
+                       lvp->text = vp->text;
+                       lvp->flags = vp->flags;
+                       vp->flags |= VSTRFIXED|VTEXTFIXED;
+                       if (eq)
+                               setvareq(name, 0);
                }
        }
-       if (quoted & 1) {
-               USTPUTC('"', nextc);
-       }
-       *nextc = 0;
-       cmdnextc = nextc;
+       lvp->vp = vp;
+       lvp->next = localvars;
+       localvars = lvp;
+       INT_ON;
 }
 
-
-static void
-showpipe(struct job *jp, FILE *out)
+/*
+ * The "local" command.
+ */
+static int
+localcmd(int argc, char **argv)
 {
-       struct procstat *sp;
-       struct procstat *spend;
+       char *name;
 
-       spend = jp->ps + jp->nprocs;
-       for (sp = jp->ps + 1; sp < spend; sp++)
-               fprintf(out, " | %s", sp->cmd);
-       outcslow('\n', out);
-       flush_stdout_stderr();
+       argv = argptr;
+       while ((name = *argv++) != NULL) {
+               mklocal(name);
+       }
+       return 0;
 }
 
-static void
-xtcsetpgrp(int fd, pid_t pgrp)
+static int
+falsecmd(int argc, char **argv)
 {
-       if (tcsetpgrp(fd, pgrp))
-               ash_msg_and_raise_error("Cannot set tty process group (%m)");
+       return 1;
 }
-#endif /* JOBS */
 
 static int
-getstatus(struct job *job)
+truecmd(int argc, char **argv)
 {
-       int status;
-       int retval;
+       return 0;
+}
 
-       status = job->ps[job->nprocs - 1].status;
-       retval = WEXITSTATUS(status);
-       if (!WIFEXITED(status)) {
-#if JOBS
-               retval = WSTOPSIG(status);
-               if (!WIFSTOPPED(status))
-#endif
-               {
-                       /* XXX: limits number of signals */
-                       retval = WTERMSIG(status);
-#if JOBS
-                       if (retval == SIGINT)
-                               job->sigint = 1;
-#endif
-               }
-               retval += 128;
+static int
+execcmd(int argc, char **argv)
+{
+       if (argc > 1) {
+               iflag = 0;              /* exit on error */
+               mflag = 0;
+               optschanged();
+               shellexec(argv + 1, pathval(), 0);
        }
-       TRACE(("getstatus: job %d, nproc %d, status %x, retval %x\n",
-               jobno(job), job->nprocs, status, retval));
-       return retval;
+       return 0;
 }
 
-#if ENABLE_ASH_MAIL
-/*      mail.c       */
-
 /*
- * Routines to check for mail.  (Perhaps make part of main.c?)
+ * The return command.
  */
+static int
+returncmd(int argc, char **argv)
+{
+       /*
+        * If called outside a function, do what ksh does;
+        * skip the rest of the file.
+        */
+       evalskip = funcnest ? SKIPFUNC : SKIPFILE;
+       return argv[1] ? number(argv[1]) : exitstatus;
+}
 
-#define MAXMBOXES 10
+/* Forward declarations for builtintab[] */
+static int breakcmd(int, char **);
+static int dotcmd(int, char **);
+static int evalcmd(int, char **);
+#if ENABLE_ASH_BUILTIN_ECHO
+static int echocmd(int, char **);
+#endif
+#if ENABLE_ASH_BUILTIN_TEST
+static int testcmd(int, char **);
+#endif
+static int exitcmd(int, char **);
+static int exportcmd(int, char **);
+#if ENABLE_ASH_GETOPTS
+static int getoptscmd(int, char **);
+#endif
+#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+static int helpcmd(int argc, char **argv);
+#endif
+#if ENABLE_ASH_MATH_SUPPORT
+static int letcmd(int, char **);
+#endif
+static int readcmd(int, char **);
+static int setcmd(int, char **);
+static int shiftcmd(int, char **);
+static int timescmd(int, char **);
+static int trapcmd(int, char **);
+static int umaskcmd(int, char **);
+static int unsetcmd(int, char **);
+static int ulimitcmd(int, char **);
+
+#define BUILTIN_NOSPEC          "0"
+#define BUILTIN_SPECIAL         "1"
+#define BUILTIN_REGULAR         "2"
+#define BUILTIN_SPEC_REG        "3"
+#define BUILTIN_ASSIGN          "4"
+#define BUILTIN_SPEC_ASSG       "5"
+#define BUILTIN_REG_ASSG        "6"
+#define BUILTIN_SPEC_REG_ASSG   "7"
+
+/* make sure to keep these in proper order since it is searched via bsearch() */
+static const struct builtincmd builtintab[] = {
+       { BUILTIN_SPEC_REG      ".", dotcmd },
+       { BUILTIN_SPEC_REG      ":", truecmd },
+#if ENABLE_ASH_BUILTIN_TEST
+       { BUILTIN_REGULAR       "[", testcmd },
+       { BUILTIN_REGULAR       "[[", testcmd },
+#endif
+#if ENABLE_ASH_ALIAS
+       { BUILTIN_REG_ASSG      "alias", aliascmd },
+#endif
+#if JOBS
+       { BUILTIN_REGULAR       "bg", fg_bgcmd },
+#endif
+       { BUILTIN_SPEC_REG      "break", breakcmd },
+       { BUILTIN_REGULAR       "cd", cdcmd },
+       { BUILTIN_NOSPEC        "chdir", cdcmd },
+#if ENABLE_ASH_CMDCMD
+       { BUILTIN_REGULAR       "command", commandcmd },
+#endif
+       { BUILTIN_SPEC_REG      "continue", breakcmd },
+#if ENABLE_ASH_BUILTIN_ECHO
+       { BUILTIN_REGULAR       "echo", echocmd },
+#endif
+       { BUILTIN_SPEC_REG      "eval", evalcmd },
+       { BUILTIN_SPEC_REG      "exec", execcmd },
+       { BUILTIN_SPEC_REG      "exit", exitcmd },
+       { BUILTIN_SPEC_REG_ASSG "export", exportcmd },
+       { BUILTIN_REGULAR       "false", falsecmd },
+#if JOBS
+       { BUILTIN_REGULAR       "fg", fg_bgcmd },
+#endif
+#if ENABLE_ASH_GETOPTS
+       { BUILTIN_REGULAR       "getopts", getoptscmd },
+#endif
+       { BUILTIN_NOSPEC        "hash", hashcmd },
+#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+       { BUILTIN_NOSPEC        "help", helpcmd },
+#endif
+#if JOBS
+       { BUILTIN_REGULAR       "jobs", jobscmd },
+       { BUILTIN_REGULAR       "kill", killcmd },
+#endif
+#if ENABLE_ASH_MATH_SUPPORT
+       { BUILTIN_NOSPEC        "let", letcmd },
+#endif
+       { BUILTIN_ASSIGN        "local", localcmd },
+       { BUILTIN_NOSPEC        "pwd", pwdcmd },
+       { BUILTIN_REGULAR       "read", readcmd },
+       { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd },
+       { BUILTIN_SPEC_REG      "return", returncmd },
+       { BUILTIN_SPEC_REG      "set", setcmd },
+       { BUILTIN_SPEC_REG      "shift", shiftcmd },
+       { BUILTIN_SPEC_REG      "source", dotcmd },
+#if ENABLE_ASH_BUILTIN_TEST
+       { BUILTIN_REGULAR       "test", testcmd },
+#endif
+       { BUILTIN_SPEC_REG      "times", timescmd },
+       { BUILTIN_SPEC_REG      "trap", trapcmd },
+       { BUILTIN_REGULAR       "true", truecmd },
+       { BUILTIN_NOSPEC        "type", typecmd },
+       { BUILTIN_NOSPEC        "ulimit", ulimitcmd },
+       { BUILTIN_REGULAR       "umask", umaskcmd },
+#if ENABLE_ASH_ALIAS
+       { BUILTIN_REGULAR       "unalias", unaliascmd },
+#endif
+       { BUILTIN_SPEC_REG      "unset", unsetcmd },
+       { BUILTIN_REGULAR       "wait", waitcmd },
+};
 
-/* times of mailboxes */
-static time_t mailtime[MAXMBOXES];
-/* Set if MAIL or MAILPATH is changed. */
-static int mail_var_path_changed;
 
+#define COMMANDCMD (builtintab + 5 + \
+       2 * ENABLE_ASH_BUILTIN_TEST + \
+       ENABLE_ASH_ALIAS + \
+       ENABLE_ASH_JOB_CONTROL)
+#define EXECCMD (builtintab + 7 + \
+       2 * ENABLE_ASH_BUILTIN_TEST + \
+       ENABLE_ASH_ALIAS + \
+       ENABLE_ASH_JOB_CONTROL + \
+       ENABLE_ASH_CMDCMD + \
+       ENABLE_ASH_BUILTIN_ECHO)
 
 /*
- * Print appropriate message(s) if mail has arrived.
- * If mail_var_path_changed is set,
- * then the value of MAIL has mail_var_path_changed,
- * so we just update the values.
+ * Search the table of builtin commands.
  */
-static void
-chkmail(void)
+static struct builtincmd *
+find_builtin(const char *name)
 {
-       const char *mpath;
-       char *p;
-       char *q;
-       time_t *mtp;
-       struct stackmark smark;
-       struct stat statb;
-
-       setstackmark(&smark);
-       mpath = mpathset() ? mpathval() : mailval();
-       for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
-               p = padvance(&mpath, nullstr);
-               if (p == NULL)
-                       break;
-               if (*p == '\0')
-                       continue;
-               for (q = p; *q; q++);
-#if DEBUG
-               if (q[-1] != '/')
-                       abort();
-#endif
-               q[-1] = '\0';                   /* delete trailing '/' */
-               if (stat(p, &statb) < 0) {
-                       *mtp = 0;
-                       continue;
-               }
-               if (!mail_var_path_changed && statb.st_mtime != *mtp) {
-                       fprintf(
-                               stderr, snlfmt,
-                               pathopt ? pathopt : "you have mail"
-                       );
-               }
-               *mtp = statb.st_mtime;
-       }
-       mail_var_path_changed = 0;
-       popstackmark(&smark);
-}
-
+       struct builtincmd *bp;
 
-static void
-changemail(const char *val)
-{
-       mail_var_path_changed++;
+       bp = bsearch(
+               name, builtintab, ARRAY_SIZE(builtintab), sizeof(builtintab[0]),
+               pstrcmp
+       );
+       return bp;
 }
 
-#endif /* ASH_MAIL */
-
 /*
- * Take commands from a file.  To be compatible we should do a path
- * search for the file, which is necessary to find sub-commands.
+ * Execute a simple command.
  */
-static char *
-find_dot_file(char *name)
+static int back_exitstatus; /* exit status of backquoted command */
+static int
+isassignment(const char *p)
 {
-       char *fullname;
-       const char *path = pathval();
-       struct stat statb;
+       const char *q = endofname(p);
+       if (p == q)
+               return 0;
+       return *q == '=';
+}
+static int
+bltincmd(int argc, char **argv)
+{
+       /* Preserve exitstatus of a previous possible redirection
+        * as POSIX mandates */
+       return back_exitstatus;
+}
+static void
+evalcommand(union node *cmd, int flags)
+{
+       static const struct builtincmd bltin = {
+               "\0\0", bltincmd
+       };
+       struct stackmark smark;
+       union node *argp;
+       struct arglist arglist;
+       struct arglist varlist;
+       char **argv;
+       int argc;
+       const struct strlist *sp;
+       struct cmdentry cmdentry;
+       struct job *jp;
+       char *lastarg;
+       const char *path;
+       int spclbltin;
+       int cmd_is_exec;
+       int status;
+       char **nargv;
+       struct builtincmd *bcmd;
+       int pseudovarflag = 0;
 
-       /* don't try this for absolute or relative paths */
-       if (strchr(name, '/'))
-               return name;
+       /* First expand the arguments. */
+       TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+       setstackmark(&smark);
+       back_exitstatus = 0;
 
-       while ((fullname = padvance(&path, name)) != NULL) {
-               if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
-                       /*
-                        * Don't bother freeing here, since it will
-                        * be freed by the caller.
-                        */
-                       return fullname;
-               }
-               stunalloc(fullname);
+       cmdentry.cmdtype = CMDBUILTIN;
+       cmdentry.u.cmd = &bltin;
+       varlist.lastp = &varlist.list;
+       *varlist.lastp = NULL;
+       arglist.lastp = &arglist.list;
+       *arglist.lastp = NULL;
+
+       argc = 0;
+       if (cmd->ncmd.args) {
+               bcmd = find_builtin(cmd->ncmd.args->narg.text);
+               pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd);
        }
 
-       /* not found in the PATH */
-       ash_msg_and_raise_error("%s: not found", name);
-       /* NOTREACHED */
-}
+       for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) {
+               struct strlist **spp;
 
-static void
-calcsize(union node *n)
-{
-       if (n == NULL)
-               return;
-       funcblocksize += nodesize[n->type];
-       switch (n->type) {
-       case NCMD:
-               calcsize(n->ncmd.redirect);
-               calcsize(n->ncmd.args);
-               calcsize(n->ncmd.assign);
-               break;
-       case NPIPE:
-               sizenodelist(n->npipe.cmdlist);
-               break;
-       case NREDIR:
-       case NBACKGND:
-       case NSUBSHELL:
-               calcsize(n->nredir.redirect);
-               calcsize(n->nredir.n);
-               break;
-       case NAND:
-       case NOR:
-       case NSEMI:
-       case NWHILE:
-       case NUNTIL:
-               calcsize(n->nbinary.ch2);
-               calcsize(n->nbinary.ch1);
-               break;
-       case NIF:
-               calcsize(n->nif.elsepart);
-               calcsize(n->nif.ifpart);
-               calcsize(n->nif.test);
-               break;
-       case NFOR:
-               funcstringsize += strlen(n->nfor.var) + 1;
-               calcsize(n->nfor.body);
-               calcsize(n->nfor.args);
-               break;
-       case NCASE:
-               calcsize(n->ncase.cases);
-               calcsize(n->ncase.expr);
-               break;
-       case NCLIST:
-               calcsize(n->nclist.body);
-               calcsize(n->nclist.pattern);
-               calcsize(n->nclist.next);
-               break;
-       case NDEFUN:
-       case NARG:
-               sizenodelist(n->narg.backquote);
-               funcstringsize += strlen(n->narg.text) + 1;
-               calcsize(n->narg.next);
-               break;
-       case NTO:
-       case NCLOBBER:
-       case NFROM:
-       case NFROMTO:
-       case NAPPEND:
-               calcsize(n->nfile.fname);
-               calcsize(n->nfile.next);
-               break;
-       case NTOFD:
-       case NFROMFD:
-               calcsize(n->ndup.vname);
-               calcsize(n->ndup.next);
-       break;
-       case NHERE:
-       case NXHERE:
-               calcsize(n->nhere.doc);
-               calcsize(n->nhere.next);
-               break;
-       case NNOT:
-               calcsize(n->nnot.com);
-               break;
-       };
-}
+               spp = arglist.lastp;
+               if (pseudovarflag && isassignment(argp->narg.text))
+                       expandarg(argp, &arglist, EXP_VARTILDE);
+               else
+                       expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
 
+               for (sp = *spp; sp; sp = sp->next)
+                       argc++;
+       }
 
-static void
-sizenodelist(struct nodelist *lp)
-{
-       while (lp) {
-               funcblocksize += SHELL_ALIGN(sizeof(struct nodelist));
-               calcsize(lp->n);
-               lp = lp->next;
+       argv = nargv = stalloc(sizeof(char *) * (argc + 1));
+       for (sp = arglist.list; sp; sp = sp->next) {
+               TRACE(("evalcommand arg: %s\n", sp->text));
+               *nargv++ = sp->text;
        }
-}
+       *nargv = NULL;
 
+       lastarg = NULL;
+       if (iflag && funcnest == 0 && argc > 0)
+               lastarg = nargv[-1];
 
-static union node *
-copynode(union node *n)
-{
-       union node *new;
+       preverrout_fd = 2;
+       expredir(cmd->ncmd.redirect);
+       status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH | REDIR_SAVEFD2);
 
-       if (n == NULL)
-               return NULL;
-       new = funcblock;
-       funcblock = (char *) funcblock + nodesize[n->type];
+       path = vpath.text;
+       for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
+               struct strlist **spp;
+               char *p;
 
-       switch (n->type) {
-       case NCMD:
-               new->ncmd.redirect = copynode(n->ncmd.redirect);
-               new->ncmd.args = copynode(n->ncmd.args);
-               new->ncmd.assign = copynode(n->ncmd.assign);
-               break;
-       case NPIPE:
-               new->npipe.cmdlist = copynodelist(n->npipe.cmdlist);
-               new->npipe.backgnd = n->npipe.backgnd;
-               break;
-       case NREDIR:
-       case NBACKGND:
-       case NSUBSHELL:
-               new->nredir.redirect = copynode(n->nredir.redirect);
-               new->nredir.n = copynode(n->nredir.n);
-               break;
-       case NAND:
-       case NOR:
-       case NSEMI:
-       case NWHILE:
-       case NUNTIL:
-               new->nbinary.ch2 = copynode(n->nbinary.ch2);
-               new->nbinary.ch1 = copynode(n->nbinary.ch1);
-               break;
-       case NIF:
-               new->nif.elsepart = copynode(n->nif.elsepart);
-               new->nif.ifpart = copynode(n->nif.ifpart);
-               new->nif.test = copynode(n->nif.test);
-               break;
-       case NFOR:
-               new->nfor.var = nodeckstrdup(n->nfor.var);
-               new->nfor.body = copynode(n->nfor.body);
-               new->nfor.args = copynode(n->nfor.args);
-               break;
-       case NCASE:
-               new->ncase.cases = copynode(n->ncase.cases);
-               new->ncase.expr = copynode(n->ncase.expr);
-               break;
-       case NCLIST:
-               new->nclist.body = copynode(n->nclist.body);
-               new->nclist.pattern = copynode(n->nclist.pattern);
-               new->nclist.next = copynode(n->nclist.next);
-               break;
-       case NDEFUN:
-       case NARG:
-               new->narg.backquote = copynodelist(n->narg.backquote);
-               new->narg.text = nodeckstrdup(n->narg.text);
-               new->narg.next = copynode(n->narg.next);
-               break;
-       case NTO:
-       case NCLOBBER:
-       case NFROM:
-       case NFROMTO:
-       case NAPPEND:
-               new->nfile.fname = copynode(n->nfile.fname);
-               new->nfile.fd = n->nfile.fd;
-               new->nfile.next = copynode(n->nfile.next);
-               break;
-       case NTOFD:
-       case NFROMFD:
-               new->ndup.vname = copynode(n->ndup.vname);
-               new->ndup.dupfd = n->ndup.dupfd;
-               new->ndup.fd = n->ndup.fd;
-               new->ndup.next = copynode(n->ndup.next);
-               break;
-       case NHERE:
-       case NXHERE:
-               new->nhere.doc = copynode(n->nhere.doc);
-               new->nhere.fd = n->nhere.fd;
-               new->nhere.next = copynode(n->nhere.next);
-               break;
-       case NNOT:
-               new->nnot.com = copynode(n->nnot.com);
-               break;
-       };
-       new->type = n->type;
-       return new;
-}
-
-
-static struct nodelist *
-copynodelist(struct nodelist *lp)
-{
-       struct nodelist *start;
-       struct nodelist **lpp;
+               spp = varlist.lastp;
+               expandarg(argp, &varlist, EXP_VARTILDE);
 
-       lpp = &start;
-       while (lp) {
-               *lpp = funcblock;
-               funcblock = (char *) funcblock + SHELL_ALIGN(sizeof(struct nodelist));
-               (*lpp)->n = copynode(lp->n);
-               lp = lp->next;
-               lpp = &(*lpp)->next;
+               /*
+                * Modify the command lookup path, if a PATH= assignment
+                * is present
+                */
+               p = (*spp)->text;
+               if (varequal(p, path))
+                       path = p;
        }
-       *lpp = NULL;
-       return start;
-}
 
+       /* Print the command if xflag is set. */
+       if (xflag) {
+               int n;
+               const char *p = " %s";
 
-static char *
-nodeckstrdup(char *s)
-{
-       char *rtn = funcstring;
+               p++;
+               dprintf(preverrout_fd, p, expandstr(ps4val()));
 
-       strcpy(funcstring, s);
-       funcstring += strlen(s) + 1;
-       return rtn;
-}
+               sp = varlist.list;
+               for (n = 0; n < 2; n++) {
+                       while (sp) {
+                               dprintf(preverrout_fd, p, sp->text);
+                               sp = sp->next;
+                               if (*p == '%') {
+                                       p--;
+                               }
+                       }
+                       sp = arglist.list;
+               }
+               full_write(preverrout_fd, "\n", 1);
+       }
 
+       cmd_is_exec = 0;
+       spclbltin = -1;
 
-/*
- * Free a parse tree.
- */
-static void
-freefunc(struct funcnode *f)
-{
-       if (f && --f->count < 0)
-               free(f);
-}
+       /* Now locate the command. */
+       if (argc) {
+               const char *oldpath;
+               int cmd_flag = DO_ERR;
 
+               path += 5;
+               oldpath = path;
+               for (;;) {
+                       find_command(argv[0], &cmdentry, cmd_flag, path);
+                       if (cmdentry.cmdtype == CMDUNKNOWN) {
+                               status = 127;
+                               flush_stderr();
+                               goto bail;
+                       }
 
-static void
-optschanged(void)
-{
-#if DEBUG
-       opentrace();
+                       /* implement bltin and command here */
+                       if (cmdentry.cmdtype != CMDBUILTIN)
+                               break;
+                       if (spclbltin < 0)
+                               spclbltin = IS_BUILTIN_SPECIAL(cmdentry.u.cmd);
+                       if (cmdentry.u.cmd == EXECCMD)
+                               cmd_is_exec++;
+#if ENABLE_ASH_CMDCMD
+                       if (cmdentry.u.cmd == COMMANDCMD) {
+                               path = oldpath;
+                               nargv = parse_command_args(argv, &path);
+                               if (!nargv)
+                                       break;
+                               argc -= nargv - argv;
+                               argv = nargv;
+                               cmd_flag |= DO_NOFUNC;
+                       } else
 #endif
-       setinteractive(iflag);
-       setjobctl(mflag);
-       setvimode(viflag);
-}
+                               break;
+               }
+       }
 
-static void
-minus_o(char *name, int val)
-{
-       int i;
+       if (status) {
+               /* We have a redirection error. */
+               if (spclbltin > 0)
+                       raise_exception(EXERROR);
+ bail:
+               exitstatus = status;
+               goto out;
+       }
 
-       if (name) {
-               for (i = 0; i < NOPTS; i++) {
-                       if (strcmp(name, optnames(i)) == 0) {
-                               optlist[i] = val;
-                               return;
+       /* Execute the command. */
+       switch (cmdentry.cmdtype) {
+       default:
+               /* Fork off a child process if necessary. */
+               if (!(flags & EV_EXIT) || trap[0]) {
+                       INT_OFF;
+                       jp = makejob(cmd, 1);
+                       if (forkshell(jp, cmd, FORK_FG) != 0) {
+                               exitstatus = waitforjob(jp);
+                               INT_ON;
+                               break;
                        }
+                       FORCE_INT_ON;
                }
-               ash_msg_and_raise_error("Illegal option -o %s", name);
-       }
-       out1str("Current option settings\n");
-       for (i = 0; i < NOPTS; i++)
-               out1fmt("%-16s%s\n", optnames(i),
-                               optlist[i] ? "on" : "off");
-}
+               listsetvar(varlist.list, VEXPORT|VSTACK);
+               shellexec(argv, path, cmdentry.u.index);
+               /* NOTREACHED */
 
+       case CMDBUILTIN:
+               cmdenviron = varlist.list;
+               if (cmdenviron) {
+                       struct strlist *list = cmdenviron;
+                       int i = VNOSET;
+                       if (spclbltin > 0 || argc == 0) {
+                               i = 0;
+                               if (cmd_is_exec && argc > 1)
+                                       i = VEXPORT;
+                       }
+                       listsetvar(list, i);
+               }
+               if (evalbltin(cmdentry.u.cmd, argc, argv)) {
+                       int exit_status;
+                       int i, j;
 
-static void
-setoption(int flag, int val)
-{
-       int i;
+                       i = exception;
+                       if (i == EXEXIT)
+                               goto raise;
 
-       for (i = 0; i < NOPTS; i++) {
-               if (optletters(i) == flag) {
-                       optlist[i] = val;
-                       return;
+                       exit_status = 2;
+                       j = 0;
+                       if (i == EXINT)
+                               j = SIGINT;
+                       if (i == EXSIG)
+                               j = pendingsig;
+                       if (j)
+                               exit_status = j + 128;
+                       exitstatus = exit_status;
+
+                       if (i == EXINT || spclbltin > 0) {
+ raise:
+                               longjmp(exception_handler->loc, 1);
+                       }
+                       FORCE_INT_ON;
                }
+               break;
+
+       case CMDFUNCTION:
+               listsetvar(varlist.list, 0);
+               if (evalfun(cmdentry.u.func, argc, argv, flags))
+                       goto raise;
+               break;
        }
-       ash_msg_and_raise_error("Illegal option -%c", flag);
-       /* NOTREACHED */
-}
 
+ out:
+       popredir(cmd_is_exec);
+       if (lastarg)
+               /* dsl: I think this is intended to be used to support
+                * '_' in 'vi' command mode during line editing...
+                * However I implemented that within libedit itself.
+                */
+               setvar("_", lastarg, 0);
+       popstackmark(&smark);
+}
 
-/*
- * Process shell options.  The global variable argptr contains a pointer
- * to the argument list; we advance it past the options.
- */
-static void
-options(int cmdline)
+static int
+evalbltin(const struct builtincmd *cmd, int argc, char **argv)
 {
-       char *p;
-       int val;
-       int c;
+       char *volatile savecmdname;
+       struct jmploc *volatile savehandler;
+       struct jmploc jmploc;
+       int i;
 
-       if (cmdline)
-               minusc = NULL;
-       while ((p = *argptr) != NULL) {
-               argptr++;
-               c = *p++;
-               if (c == '-') {
-                       val = 1;
-                       if (p[0] == '\0' || LONE_DASH(p)) {
-                               if (!cmdline) {
-                                       /* "-" means turn off -x and -v */
-                                       if (p[0] == '\0')
-                                               xflag = vflag = 0;
-                                       /* "--" means reset params */
-                                       else if (*argptr == NULL)
-                                               setparam(argptr);
-                               }
-                               break;    /* "-" or  "--" terminates options */
-                       }
-               } else if (c == '+') {
-                       val = 0;
-               } else {
-                       argptr--;
-                       break;
-               }
-               while ((c = *p++) != '\0') {
-                       if (c == 'c' && cmdline) {
-                               minusc = p;     /* command is after shell args*/
-                       } else if (c == 'o') {
-                               minus_o(*argptr, val);
-                               if (*argptr)
-                                       argptr++;
-                       } else if (cmdline && (c == '-')) {     // long options
-                               if (strcmp(p, "login") == 0)
-                                       isloginsh = 1;
-                               break;
-                       } else {
-                               setoption(c, val);
-                       }
-               }
-       }
-}
+       savecmdname = commandname;
+       i = setjmp(jmploc.loc);
+       if (i)
+               goto cmddone;
+       savehandler = exception_handler;
+       exception_handler = &jmploc;
+       commandname = argv[0];
+       argptr = argv + 1;
+       optptr = NULL;                  /* initialize nextopt */
+       exitstatus = (*cmd->builtin)(argc, argv);
+       flush_stdout_stderr();
+ cmddone:
+       exitstatus |= ferror(stdout);
+       clearerr(stdout);
+       commandname = savecmdname;
+       exsig = 0;
+       exception_handler = savehandler;
 
+       return i;
+}
 
-/*
- * Set the shell parameters.
- */
-static void
-setparam(char **argv)
+static int
+goodname(const char *p)
 {
-       char **newparam;
-       char **ap;
-       int nparam;
-
-       for (nparam = 0; argv[nparam]; nparam++);
-       ap = newparam = ckmalloc((nparam + 1) * sizeof(*ap));
-       while (*argv) {
-               *ap++ = ckstrdup(*argv++);
-       }
-       *ap = NULL;
-       freeparam(&shellparam);
-       shellparam.malloc = 1;
-       shellparam.nparam = nparam;
-       shellparam.p = newparam;
-#if ENABLE_ASH_GETOPTS
-       shellparam.optind = 1;
-       shellparam.optoff = -1;
-#endif
+       return !*endofname(p);
 }
 
 
 /*
- * Free the list of positional parameters.
+ * Search for a command.  This is called before we fork so that the
+ * location of the command will be available in the parent as well as
+ * the child.  The check for "goodname" is an overly conservative
+ * check that the name will not be subject to expansion.
  */
 static void
-freeparam(volatile struct shparam *param)
+prehash(union node *n)
 {
-       char **ap;
+       struct cmdentry entry;
 
-       if (param->malloc) {
-               for (ap = param->p; *ap; ap++)
-                       free(*ap);
-               free(param->p);
-       }
+       if (n->type == NCMD && n->ncmd.args && goodname(n->ncmd.args->narg.text))
+               find_command(n->ncmd.args->narg.text, &entry, 0, pathval());
 }
 
 
+/* ============ Builtin commands
+ *
+ * Builtin commands whose functions are closely tied to evaluation
+ * are implemented here.
+ */
+
 /*
- * The shift builtin command.
+ * Handle break and continue commands.  Break, continue, and return are
+ * all handled by setting the evalskip flag.  The evaluation routines
+ * above all check this flag, and if it is set they start skipping
+ * commands rather than executing them.  The variable skipcount is
+ * the number of loops to break/continue, or the number of function
+ * levels to return.  (The latter is always 1.)  It should probably
+ * be an error to break out of more loops than exist, but it isn't
+ * in the standard shell so we don't make it one here.
  */
 static int
-shiftcmd(int argc, char **argv)
+breakcmd(int argc, char **argv)
 {
-       int n;
-       char **ap1, **ap2;
+       int n = argc > 1 ? number(argv[1]) : 1;
 
-       n = 1;
-       if (argc > 1)
-               n = number(argv[1]);
-       if (n > shellparam.nparam)
-               ash_msg_and_raise_error("can't shift that many");
-       INT_OFF;
-       shellparam.nparam -= n;
-       for (ap1 = shellparam.p; --n >= 0; ap1++) {
-               if (shellparam.malloc)
-                       free(*ap1);
+       if (n <= 0)
+               ash_msg_and_raise_error(illnum, argv[1]);
+       if (n > loopnest)
+               n = loopnest;
+       if (n > 0) {
+               evalskip = (**argv == 'c') ? SKIPCONT : SKIPBREAK;
+               skipcount = n;
        }
-       ap2 = shellparam.p;
-       while ((*ap2++ = *ap1++) != NULL);
-#if ENABLE_ASH_GETOPTS
-       shellparam.optind = 1;
-       shellparam.optoff = -1;
-#endif
-       INT_ON;
        return 0;
 }
 
 
-/*
- * POSIX requires that 'set' (but not export or readonly) output the
- * variables in lexicographic order - by the locale's collating order (sigh).
- * Maybe we could keep them in an ordered balanced binary tree
- * instead of hashed lists.
- * For now just roll 'em through qsort for printing...
+/* ============ input.c
+ *
+ * This implements the input routines used by the parser.
  */
-static int
-showvars(const char *sep_prefix, int on, int off)
-{
-       const char *sep;
-       char **ep, **epend;
 
-       ep = listvars(on, off, &epend);
-       qsort(ep, epend - ep, sizeof(char *), vpcmp);
+#define EOF_NLEFT -99           /* value of parsenleft when EOF pushed back */
 
-       sep = *sep_prefix ? spcstr : sep_prefix;
+enum {
+       INPUT_PUSH_FILE = 1,
+       INPUT_NOFILE_OK = 2,
+};
 
-       for (; ep < epend; ep++) {
-               const char *p;
-               const char *q;
+static int plinno = 1;                  /* input line number */
+/* number of characters left in input buffer */
+static int parsenleft;                  /* copy of parsefile->nleft */
+static int parselleft;                  /* copy of parsefile->lleft */
+/* next character in input buffer */
+static char *parsenextc;                /* copy of parsefile->nextc */
 
-               p = strchrnul(*ep, '=');
-               q = nullstr;
-               if (*p)
-                       q = single_quote(++p);
-               out1fmt("%s%s%.*s%s\n", sep_prefix, sep, (int)(p - *ep), *ep, q);
-       }
-       return 0;
-}
+static int checkkwd;
+/* values of checkkwd variable */
+#define CHKALIAS        0x1
+#define CHKKWD          0x2
+#define CHKNL           0x4
 
-/*
- * The set command builtin.
- */
-static int
-setcmd(int argc, char **argv)
+static void
+popstring(void)
 {
-       if (argc == 1)
-               return showvars(nullstr, 0, VUNSET);
+       struct strpush *sp = parsefile->strpush;
+
        INT_OFF;
-       options(0);
-       optschanged();
-       if (*argptr != NULL) {
-               setparam(argptr);
+#if ENABLE_ASH_ALIAS
+       if (sp->ap) {
+               if (parsenextc[-1] == ' ' || parsenextc[-1] == '\t') {
+                       checkkwd |= CHKALIAS;
+               }
+               if (sp->string != sp->ap->val) {
+                       free(sp->string);
+               }
+               sp->ap->flag &= ~ALIASINUSE;
+               if (sp->ap->flag & ALIASDEAD) {
+                       unalias(sp->ap->name);
+               }
        }
+#endif
+       parsenextc = sp->prevstring;
+       parsenleft = sp->prevnleft;
+/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+       parsefile->strpush = sp->prev;
+       if (sp != &(parsefile->basestrpush))
+               free(sp);
        INT_ON;
-       return 0;
 }
 
-
-#if ENABLE_LOCALE_SUPPORT
-static void
-change_lc_all(const char *value)
+static int
+preadfd(void)
 {
-       if (value && *value != '\0')
-               setlocale(LC_ALL, value);
-}
+       int nr;
+       char *buf =  parsefile->buf;
+       parsenextc = buf;
 
-static void
-change_lc_ctype(const char *value)
-{
-       if (value && *value != '\0')
-               setlocale(LC_CTYPE, value);
-}
+ retry:
+#if ENABLE_FEATURE_EDITING
+       if (!iflag || parsefile->fd)
+               nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
+       else {
+#if ENABLE_FEATURE_TAB_COMPLETION
+               line_input_state->path_lookup = pathval();
 #endif
-
-#if ENABLE_ASH_RANDOM_SUPPORT
-/* Roughly copied from bash.. */
-static void
-change_random(const char *value)
-{
-       if (value == NULL) {
-               /* "get", generate */
-               char buf[16];
-
-               rseed = rseed * 1103515245 + 12345;
-               sprintf(buf, "%d", (unsigned int)((rseed & 32767)));
-               /* set without recursion */
-               setvar(vrandom.text, buf, VNOFUNC);
-               vrandom.flags &= ~VNOFUNC;
-       } else {
-               /* set/reset */
-               rseed = strtoul(value, (char **)NULL, 10);
+               nr = read_line_input(cmdedit_prompt, buf, BUFSIZ, line_input_state);
+               if (nr == 0) {
+                       /* Ctrl+C pressed */
+                       if (trap[SIGINT]) {
+                               buf[0] = '\n';
+                               buf[1] = '\0';
+                               raise(SIGINT);
+                               return 1;
+                       }
+                       goto retry;
+               }
+               if (nr < 0 && errno == 0) {
+                       /* Ctrl+D presend */
+                       nr = 0;
+               }
        }
-}
+#else
+       nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
 #endif
 
+       if (nr < 0) {
+               if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
+                       int flags = fcntl(0, F_GETFL);
+                       if (flags >= 0 && flags & O_NONBLOCK) {
+                               flags &=~ O_NONBLOCK;
+                               if (fcntl(0, F_SETFL, flags) >= 0) {
+                                       out2str("sh: turning off NDELAY mode\n");
+                                       goto retry;
+                               }
+                       }
+               }
+       }
+       return nr;
+}
 
-#if ENABLE_ASH_GETOPTS
+/*
+ * Refill the input buffer and return the next input character:
+ *
+ * 1) If a string was pushed back on the input, pop it;
+ * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
+ *    from a string so we can't refill the buffer, return EOF.
+ * 3) If the is more stuff in this buffer, use it else call read to fill it.
+ * 4) Process input up to the next newline, deleting nul characters.
+ */
 static int
-getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *optoff)
+preadbuffer(void)
 {
-       char *p, *q;
-       char c = '?';
-       int done = 0;
-       int err = 0;
-       char s[12];
-       char **optnext;
-
-       if (*param_optind < 1)
-               return 1;
-       optnext = optfirst + *param_optind - 1;
+       char *q;
+       int more;
+       char savec;
 
-       if (*param_optind <= 1 || *optoff < 0 || strlen(optnext[-1]) < *optoff)
-               p = NULL;
-       else
-               p = optnext[-1] + *optoff;
-       if (p == NULL || *p == '\0') {
-               /* Current word is done, advance */
-               p = *optnext;
-               if (p == NULL || *p != '-' || *++p == '\0') {
- atend:
-                       p = NULL;
-                       done = 1;
-                       goto out;
+       while (parsefile->strpush) {
+#if ENABLE_ASH_ALIAS
+               if (parsenleft == -1 && parsefile->strpush->ap &&
+                       parsenextc[-1] != ' ' && parsenextc[-1] != '\t') {
+                       return PEOA;
                }
-               optnext++;
-               if (LONE_DASH(p))        /* check for "--" */
-                       goto atend;
+#endif
+               popstring();
+               if (--parsenleft >= 0)
+                       return signed_char2int(*parsenextc++);
        }
+       if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
+               return PEOF;
+       flush_stdout_stderr();
 
-       c = *p++;
-       for (q = optstr; *q != c; ) {
-               if (*q == '\0') {
-                       if (optstr[0] == ':') {
-                               s[0] = c;
-                               s[1] = '\0';
-                               err |= setvarsafe("OPTARG", s, 0);
-                       } else {
-                               fprintf(stderr, "Illegal option -%c\n", c);
-                               unsetvar("OPTARG");
-                       }
-                       c = '?';
-                       goto out;
+       more = parselleft;
+       if (more <= 0) {
+ again:
+               more = preadfd();
+               if (more <= 0) {
+                       parselleft = parsenleft = EOF_NLEFT;
+                       return PEOF;
                }
-               if (*++q == ':')
-                       q++;
        }
 
-       if (*++q == ':') {
-               if (*p == '\0' && (p = *optnext) == NULL) {
-                       if (optstr[0] == ':') {
-                               s[0] = c;
-                               s[1] = '\0';
-                               err |= setvarsafe("OPTARG", s, 0);
-                               c = ':';
-                       } else {
-                               fprintf(stderr, "No arg for -%c option\n", c);
-                               unsetvar("OPTARG");
-                               c = '?';
+       q = parsenextc;
+
+       /* delete nul characters */
+       for (;;) {
+               int c;
+
+               more--;
+               c = *q;
+
+               if (!c)
+                       memmove(q, q + 1, more);
+               else {
+                       q++;
+                       if (c == '\n') {
+                               parsenleft = q - parsenextc - 1;
+                               break;
                        }
-                       goto out;
                }
 
-               if (p == *optnext)
-                       optnext++;
-               err |= setvarsafe("OPTARG", p, 0);
-               p = NULL;
-       } else
-               err |= setvarsafe("OPTARG", nullstr, 0);
- out:
-       *optoff = p ? p - *(optnext - 1) : -1;
-       *param_optind = optnext - optfirst + 1;
-       fmtstr(s, sizeof(s), "%d", *param_optind);
-       err |= setvarsafe("OPTIND", s, VNOFUNC);
-       s[0] = c;
-       s[1] = '\0';
-       err |= setvarsafe(optvar, s, 0);
-       if (err) {
-               *param_optind = 1;
-               *optoff = -1;
-               flush_stdout_stderr();
-               raise_exception(EXERROR);
+               if (more <= 0) {
+                       parsenleft = q - parsenextc - 1;
+                       if (parsenleft < 0)
+                               goto again;
+                       break;
+               }
        }
-       return done;
+       parselleft = more;
+
+       savec = *q;
+       *q = '\0';
+
+       if (vflag) {
+               out2str(parsenextc);
+       }
+
+       *q = savec;
+
+       return signed_char2int(*parsenextc++);
 }
 
+#define pgetc_as_macro() (--parsenleft >= 0? signed_char2int(*parsenextc++) : preadbuffer())
+static int
+pgetc(void)
+{
+       return pgetc_as_macro();
+}
+
+#if ENABLE_ASH_OPTIMIZE_FOR_SIZE
+#define pgetc_macro() pgetc()
+#else
+#define pgetc_macro() pgetc_as_macro()
+#endif
 
 /*
- * The getopts builtin.  Shellparam.optnext points to the next argument
- * to be processed.  Shellparam.optptr points to the next character to
- * be processed in the current argument.  If shellparam.optnext is NULL,
- * then it's the first time getopts has been called.
+ * Same as pgetc(), but ignores PEOA.
  */
+#if ENABLE_ASH_ALIAS
 static int
-getoptscmd(int argc, char **argv)
+pgetc2(void)
 {
-       char **optbase;
-
-       if (argc < 3)
-               ash_msg_and_raise_error("Usage: getopts optstring var [arg]");
-       if (argc == 3) {
-               optbase = shellparam.p;
-               if (shellparam.optind > shellparam.nparam + 1) {
-                       shellparam.optind = 1;
-                       shellparam.optoff = -1;
-               }
-       } else {
-               optbase = &argv[3];
-               if (shellparam.optind > argc - 2) {
-                       shellparam.optind = 1;
-                       shellparam.optoff = -1;
-               }
-       }
+       int c;
 
-       return getopts(argv[1], argv[2], optbase, &shellparam.optind,
-                       &shellparam.optoff);
+       do {
+               c = pgetc_macro();
+       } while (c == PEOA);
+       return c;
 }
-#endif /* ASH_GETOPTS */
-
-
-/* ============ Shell parser */
-
-static void raise_error_syntax(const char *) ATTRIBUTE_NORETURN;
-static void
-raise_error_syntax(const char *msg)
+#else
+static int
+pgetc2(void)
 {
-       ash_msg_and_raise_error("Syntax error: %s", msg);
-       /* NOTREACHED */
+       return pgetc_macro();
 }
+#endif
 
 /*
- * Called when an unexpected token is read during the parse.  The argument
- * is the token that is expected, or -1 if more than one type of token can
- * occur at this point.
+ * Read a line from the script.
  */
-static void raise_error_unexpected_syntax(int) ATTRIBUTE_NORETURN;
-static void
-raise_error_unexpected_syntax(int token)
+static char *
+pfgets(char *line, int len)
 {
-       char msg[64];
-       int l;
+       char *p = line;
+       int nleft = len;
+       int c;
 
-       l = sprintf(msg, "%s unexpected", tokname(lasttoken));
-       if (token >= 0)
-               sprintf(msg + l, " (expecting %s)", tokname(token));
-       raise_error_syntax(msg);
-       /* NOTREACHED */
-}
-
-#define EOFMARKLEN 79
-
-struct heredoc {
-       struct heredoc *next;   /* next here document in list */
-       union node *here;               /* redirection node */
-       char *eofmark;          /* string indicating end of input */
-       int striptabs;          /* if set, strip leading tabs */
-};
-
-static struct heredoc *heredoclist;    /* list of here documents to read */
-
-/* parsing is heavily cross-recursive, need these forward decls */
-static union node *andor(void);
-static union node *pipeline(void);
-static union node *parse_command(void);
-static void parseheredoc(void);
-static char peektoken(void);
-static int readtoken(void);
-
-static union node *
-list(int nlflag)
-{
-       union node *n1, *n2, *n3;
-       int tok;
-
-       checkkwd = CHKNL | CHKKWD | CHKALIAS;
-       if (nlflag == 2 && peektoken())
-               return NULL;
-       n1 = NULL;
-       for (;;) {
-               n2 = andor();
-               tok = readtoken();
-               if (tok == TBACKGND) {
-                       if (n2->type == NPIPE) {
-                               n2->npipe.backgnd = 1;
-                       } else {
-                               if (n2->type != NREDIR) {
-                                       n3 = stalloc(sizeof(struct nredir));
-                                       n3->nredir.n = n2;
-                                       n3->nredir.redirect = NULL;
-                                       n2 = n3;
-                               }
-                               n2->type = NBACKGND;
-                       }
-               }
-               if (n1 == NULL) {
-                       n1 = n2;
-               } else {
-                       n3 = stalloc(sizeof(struct nbinary));
-                       n3->type = NSEMI;
-                       n3->nbinary.ch1 = n1;
-                       n3->nbinary.ch2 = n2;
-                       n1 = n3;
-               }
-               switch (tok) {
-               case TBACKGND:
-               case TSEMI:
-                       tok = readtoken();
-                       /* fall through */
-               case TNL:
-                       if (tok == TNL) {
-                               parseheredoc();
-                               if (nlflag == 1)
-                                       return n1;
-                       } else {
-                               tokpushback++;
-                       }
-                       checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                       if (peektoken())
-                               return n1;
+       while (--nleft > 0) {
+               c = pgetc2();
+               if (c == PEOF) {
+                       if (p == line)
+                               return NULL;
                        break;
-               case TEOF:
-                       if (heredoclist)
-                               parseheredoc();
-                       else
-                               pungetc();              /* push back EOF on input */
-                       return n1;
-               default:
-                       if (nlflag == 1)
-                               raise_error_unexpected_syntax(-1);
-                       tokpushback++;
-                       return n1;
                }
+               *p++ = c;
+               if (c == '\n')
+                       break;
        }
+       *p = '\0';
+       return line;
 }
 
-static union node *
-andor(void)
+/*
+ * Undo the last call to pgetc.  Only one character may be pushed back.
+ * PEOF may be pushed back.
+ */
+static void
+pungetc(void)
 {
-       union node *n1, *n2, *n3;
-       int t;
-
-       n1 = pipeline();
-       for (;;) {
-               t = readtoken();
-               if (t == TAND) {
-                       t = NAND;
-               } else if (t == TOR) {
-                       t = NOR;
-               } else {
-                       tokpushback++;
-                       return n1;
-               }
-               checkkwd = CHKNL | CHKKWD | CHKALIAS;
-               n2 = pipeline();
-               n3 = stalloc(sizeof(struct nbinary));
-               n3->type = t;
-               n3->nbinary.ch1 = n1;
-               n3->nbinary.ch2 = n2;
-               n1 = n3;
-       }
+       parsenleft++;
+       parsenextc--;
 }
 
-static union node *
-pipeline(void)
+/*
+ * Push a string back onto the input at this current parsefile level.
+ * We handle aliases this way.
+ */
+static void
+pushstring(char *s, void *ap)
 {
-       union node *n1, *n2, *pipenode;
-       struct nodelist *lp, *prev;
-       int negate;
+       struct strpush *sp;
+       size_t len;
 
-       negate = 0;
-       TRACE(("pipeline: entered\n"));
-       if (readtoken() == TNOT) {
-               negate = !negate;
-               checkkwd = CHKKWD | CHKALIAS;
+       len = strlen(s);
+       INT_OFF;
+/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+       if (parsefile->strpush) {
+               sp = ckmalloc(sizeof(struct strpush));
+               sp->prev = parsefile->strpush;
+               parsefile->strpush = sp;
        } else
-               tokpushback++;
-       n1 = parse_command();
-       if (readtoken() == TPIPE) {
-               pipenode = stalloc(sizeof(struct npipe));
-               pipenode->type = NPIPE;
-               pipenode->npipe.backgnd = 0;
-               lp = stalloc(sizeof(struct nodelist));
-               pipenode->npipe.cmdlist = lp;
-               lp->n = n1;
-               do {
-                       prev = lp;
-                       lp = stalloc(sizeof(struct nodelist));
-                       checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                       lp->n = parse_command();
-                       prev->next = lp;
-               } while (readtoken() == TPIPE);
-               lp->next = NULL;
-               n1 = pipenode;
-       }
-       tokpushback++;
-       if (negate) {
-               n2 = stalloc(sizeof(struct nnot));
-               n2->type = NNOT;
-               n2->nnot.com = n1;
-               return n2;
+               sp = parsefile->strpush = &(parsefile->basestrpush);
+       sp->prevstring = parsenextc;
+       sp->prevnleft = parsenleft;
+#if ENABLE_ASH_ALIAS
+       sp->ap = (struct alias *)ap;
+       if (ap) {
+               ((struct alias *)ap)->flag |= ALIASINUSE;
+               sp->string = s;
        }
-       return n1;
+#endif
+       parsenextc = s;
+       parsenleft = len;
+       INT_ON;
 }
 
-static union node *
-makename(void)
+/*
+ * To handle the "." command, a stack of input files is used.  Pushfile
+ * adds a new entry to the stack and popfile restores the previous level.
+ */
+static void
+pushfile(void)
 {
-       union node *n;
+       struct parsefile *pf;
 
-       n = stalloc(sizeof(struct narg));
-       n->type = NARG;
-       n->narg.next = NULL;
-       n->narg.text = wordtext;
-       n->narg.backquote = backquotelist;
-       return n;
+       parsefile->nleft = parsenleft;
+       parsefile->lleft = parselleft;
+       parsefile->nextc = parsenextc;
+       parsefile->linno = plinno;
+       pf = ckmalloc(sizeof(*pf));
+       pf->prev = parsefile;
+       pf->fd = -1;
+       pf->strpush = NULL;
+       pf->basestrpush.prev = NULL;
+       parsefile = pf;
 }
 
 static void
-fixredir(union node *n, const char *text, int err)
+popfile(void)
 {
-       TRACE(("Fix redir %s %d\n", text, err));
-       if (!err)
-               n->ndup.vname = NULL;
+       struct parsefile *pf = parsefile;
 
-       if (isdigit(text[0]) && text[1] == '\0')
-               n->ndup.dupfd = digit_val(text[0]);
-       else if (LONE_DASH(text))
-               n->ndup.dupfd = -1;
-       else {
-               if (err)
-                       raise_error_syntax("Bad fd number");
-               n->ndup.vname = makename();
-       }
+       INT_OFF;
+       if (pf->fd >= 0)
+               close(pf->fd);
+       free(pf->buf);
+       while (pf->strpush)
+               popstring();
+       parsefile = pf->prev;
+       free(pf);
+       parsenleft = parsefile->nleft;
+       parselleft = parsefile->lleft;
+       parsenextc = parsefile->nextc;
+       plinno = parsefile->linno;
+       INT_ON;
 }
 
 /*
- * Returns true if the text contains nothing to expand (no dollar signs
- * or backquotes).
+ * Return to top level.
  */
-static int
-noexpand(char *text)
+static void
+popallfiles(void)
 {
-       char *p;
-       char c;
+       while (parsefile != &basepf)
+               popfile();
+}
 
-       p = text;
-       while ((c = *p++) != '\0') {
-               if (c == CTLQUOTEMARK)
-                       continue;
-               if (c == CTLESC)
-                       p++;
-               else if (SIT(c, BASESYNTAX) == CCTL)
-                       return 0;
+/*
+ * Close the file(s) that the shell is reading commands from.  Called
+ * after a fork is done.
+ */
+static void
+closescript(void)
+{
+       popallfiles();
+       if (parsefile->fd > 0) {
+               close(parsefile->fd);
+               parsefile->fd = 0;
        }
-       return 1;
 }
 
+/*
+ * Like setinputfile, but takes an open file descriptor.  Call this with
+ * interrupts off.
+ */
 static void
-parsefname(void)
+setinputfd(int fd, int push)
 {
-       union node *n = redirnode;
+       close_on_exec_on(fd);
+       if (push) {
+               pushfile();
+               parsefile->buf = 0;
+       }
+       parsefile->fd = fd;
+       if (parsefile->buf == NULL)
+               parsefile->buf = ckmalloc(IBUFSIZ);
+       parselleft = parsenleft = 0;
+       plinno = 1;
+}
 
-       if (readtoken() != TWORD)
-               raise_error_unexpected_syntax(-1);
-       if (n->type == NHERE) {
-               struct heredoc *here = heredoc;
-               struct heredoc *p;
-               int i;
+/*
+ * Set the input to take input from a file.  If push is set, push the
+ * old input onto the stack first.
+ */
+static int
+setinputfile(const char *fname, int flags)
+{
+       int fd;
+       int fd2;
 
-               if (quoteflag == 0)
-                       n->type = NXHERE;
-               TRACE(("Here document %d\n", n->type));
-               if (!noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
-                       raise_error_syntax("Illegal eof marker for << redirection");
-               rmescapes(wordtext);
-               here->eofmark = wordtext;
-               here->next = NULL;
-               if (heredoclist == NULL)
-                       heredoclist = here;
-               else {
-                       for (p = heredoclist; p->next; p = p->next);
-                       p->next = here;
-               }
-       } else if (n->type == NTOFD || n->type == NFROMFD) {
-               fixredir(n, wordtext, 0);
-       } else {
-               n->nfile.fname = makename();
+       INT_OFF;
+       fd = open(fname, O_RDONLY);
+       if (fd < 0) {
+               if (flags & INPUT_NOFILE_OK)
+                       goto out;
+               ash_msg_and_raise_error("can't open %s", fname);
+       }
+       if (fd < 10) {
+               fd2 = copyfd(fd, 10);
+               close(fd);
+               if (fd2 < 0)
+                       ash_msg_and_raise_error("out of file descriptors");
+               fd = fd2;
        }
+       setinputfd(fd, flags & INPUT_PUSH_FILE);
+ out:
+       INT_ON;
+       return fd;
 }
 
-static union node *
-simplecmd(void)
+/*
+ * Like setinputfile, but takes input from a string.
+ */
+static void
+setinputstring(char *string)
 {
-       union node *args, **app;
-       union node *n = NULL;
-       union node *vars, **vpp;
-       union node **rpp, *redir;
-       int savecheckkwd;
+       INT_OFF;
+       pushfile();
+       parsenextc = string;
+       parsenleft = strlen(string);
+       parsefile->buf = NULL;
+       plinno = 1;
+       INT_ON;
+}
 
-       args = NULL;
-       app = &args;
-       vars = NULL;
-       vpp = &vars;
-       redir = NULL;
-       rpp = &redir;
 
-       savecheckkwd = CHKALIAS;
-       for (;;) {
-               checkkwd = savecheckkwd;
-               switch (readtoken()) {
-               case TWORD:
-                       n = stalloc(sizeof(struct narg));
-                       n->type = NARG;
-                       n->narg.text = wordtext;
-                       n->narg.backquote = backquotelist;
-                       if (savecheckkwd && isassignment(wordtext)) {
-                               *vpp = n;
-                               vpp = &n->narg.next;
-                       } else {
-                               *app = n;
-                               app = &n->narg.next;
-                               savecheckkwd = 0;
-                       }
-                       break;
-               case TREDIR:
-                       *rpp = n = redirnode;
-                       rpp = &n->nfile.next;
-                       parsefname();   /* read name of redirection file */
-                       break;
-               case TLP:
-                       if (args && app == &args->narg.next
-                        && !vars && !redir
-                       ) {
-                               struct builtincmd *bcmd;
-                               const char *name;
+/* ============ mail.c
+ *
+ * Routines to check for mail.
+ */
 
-                               /* We have a function */
-                               if (readtoken() != TRP)
-                                       raise_error_unexpected_syntax(TRP);
-                               name = n->narg.text;
-                               if (!goodname(name)
-                                || ((bcmd = find_builtin(name)) && IS_BUILTIN_SPECIAL(bcmd))
-                               ) {
-                                       raise_error_syntax("Bad function name");
-                               }
-                               n->type = NDEFUN;
-                               checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                               n->narg.next = parse_command();
-                               return n;
-                       }
-                       /* fall through */
-               default:
-                       tokpushback++;
-                       goto out;
+#if ENABLE_ASH_MAIL
+
+#define MAXMBOXES 10
+
+/* times of mailboxes */
+static time_t mailtime[MAXMBOXES];
+/* Set if MAIL or MAILPATH is changed. */
+static smallint mail_var_path_changed;
+
+/*
+ * Print appropriate message(s) if mail has arrived.
+ * If mail_var_path_changed is set,
+ * then the value of MAIL has mail_var_path_changed,
+ * so we just update the values.
+ */
+static void
+chkmail(void)
+{
+       const char *mpath;
+       char *p;
+       char *q;
+       time_t *mtp;
+       struct stackmark smark;
+       struct stat statb;
+
+       setstackmark(&smark);
+       mpath = mpathset() ? mpathval() : mailval();
+       for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
+               p = padvance(&mpath, nullstr);
+               if (p == NULL)
+                       break;
+               if (*p == '\0')
+                       continue;
+               for (q = p; *q; q++);
+#if DEBUG
+               if (q[-1] != '/')
+                       abort();
+#endif
+               q[-1] = '\0';                   /* delete trailing '/' */
+               if (stat(p, &statb) < 0) {
+                       *mtp = 0;
+                       continue;
+               }
+               if (!mail_var_path_changed && statb.st_mtime != *mtp) {
+                       fprintf(
+                               stderr, snlfmt,
+                               pathopt ? pathopt : "you have mail"
+                       );
                }
+               *mtp = statb.st_mtime;
        }
- out:
-       *app = NULL;
-       *vpp = NULL;
-       *rpp = NULL;
-       n = stalloc(sizeof(struct ncmd));
-       n->type = NCMD;
-       n->ncmd.args = args;
-       n->ncmd.assign = vars;
-       n->ncmd.redirect = redir;
-       return n;
+       mail_var_path_changed = 0;
+       popstackmark(&smark);
 }
 
-static union node *
-parse_command(void)
+static void
+changemail(const char *val)
 {
-       union node *n1, *n2;
-       union node *ap, **app;
-       union node *cp, **cpp;
-       union node *redir, **rpp;
-       union node **rpp2;
-       int t;
+       mail_var_path_changed = 1;
+}
 
-       redir = NULL;
-       rpp2 = &redir;
+#endif /* ASH_MAIL */
 
-       switch (readtoken()) {
-       default:
-               raise_error_unexpected_syntax(-1);
-               /* NOTREACHED */
-       case TIF:
-               n1 = stalloc(sizeof(struct nif));
-               n1->type = NIF;
-               n1->nif.test = list(0);
-               if (readtoken() != TTHEN)
-                       raise_error_unexpected_syntax(TTHEN);
-               n1->nif.ifpart = list(0);
-               n2 = n1;
-               while (readtoken() == TELIF) {
-                       n2->nif.elsepart = stalloc(sizeof(struct nif));
-                       n2 = n2->nif.elsepart;
-                       n2->type = NIF;
-                       n2->nif.test = list(0);
-                       if (readtoken() != TTHEN)
-                               raise_error_unexpected_syntax(TTHEN);
-                       n2->nif.ifpart = list(0);
-               }
-               if (lasttoken == TELSE)
-                       n2->nif.elsepart = list(0);
-               else {
-                       n2->nif.elsepart = NULL;
-                       tokpushback++;
-               }
-               t = TFI;
-               break;
-       case TWHILE:
-       case TUNTIL: {
-               int got;
-               n1 = stalloc(sizeof(struct nbinary));
-               n1->type = (lasttoken == TWHILE) ? NWHILE : NUNTIL;
-               n1->nbinary.ch1 = list(0);
-               got = readtoken();
-               if (got != TDO) {
-                       TRACE(("expecting DO got %s %s\n", tokname(got),
-                                       got == TWORD ? wordtext : ""));
-                       raise_error_unexpected_syntax(TDO);
-               }
-               n1->nbinary.ch2 = list(0);
-               t = TDONE;
-               break;
+
+/* ============ ??? */
+
+/*
+ * Set the shell parameters.
+ */
+static void
+setparam(char **argv)
+{
+       char **newparam;
+       char **ap;
+       int nparam;
+
+       for (nparam = 0; argv[nparam]; nparam++);
+       ap = newparam = ckmalloc((nparam + 1) * sizeof(*ap));
+       while (*argv) {
+               *ap++ = ckstrdup(*argv++);
        }
-       case TFOR:
-               if (readtoken() != TWORD || quoteflag || ! goodname(wordtext))
-                       raise_error_syntax("Bad for loop variable");
-               n1 = stalloc(sizeof(struct nfor));
-               n1->type = NFOR;
-               n1->nfor.var = wordtext;
-               checkkwd = CHKKWD | CHKALIAS;
-               if (readtoken() == TIN) {
-                       app = &ap;
-                       while (readtoken() == TWORD) {
-                               n2 = stalloc(sizeof(struct narg));
-                               n2->type = NARG;
-                               n2->narg.text = wordtext;
-                               n2->narg.backquote = backquotelist;
-                               *app = n2;
-                               app = &n2->narg.next;
-                       }
-                       *app = NULL;
-                       n1->nfor.args = ap;
-                       if (lasttoken != TNL && lasttoken != TSEMI)
-                               raise_error_unexpected_syntax(-1);
-               } else {
-                       n2 = stalloc(sizeof(struct narg));
-                       n2->type = NARG;
-                       n2->narg.text = (char *)dolatstr;
-                       n2->narg.backquote = NULL;
-                       n2->narg.next = NULL;
-                       n1->nfor.args = n2;
-                       /*
-                        * Newline or semicolon here is optional (but note
-                        * that the original Bourne shell only allowed NL).
-                        */
-                       if (lasttoken != TNL && lasttoken != TSEMI)
-                               tokpushback++;
-               }
-               checkkwd = CHKNL | CHKKWD | CHKALIAS;
-               if (readtoken() != TDO)
-                       raise_error_unexpected_syntax(TDO);
-               n1->nfor.body = list(0);
-               t = TDONE;
-               break;
-       case TCASE:
-               n1 = stalloc(sizeof(struct ncase));
-               n1->type = NCASE;
-               if (readtoken() != TWORD)
-                       raise_error_unexpected_syntax(TWORD);
-               n1->ncase.expr = n2 = stalloc(sizeof(struct narg));
-               n2->type = NARG;
-               n2->narg.text = wordtext;
-               n2->narg.backquote = backquotelist;
-               n2->narg.next = NULL;
-               do {
-                       checkkwd = CHKKWD | CHKALIAS;
-               } while (readtoken() == TNL);
-               if (lasttoken != TIN)
-                       raise_error_unexpected_syntax(TIN);
-               cpp = &n1->ncase.cases;
- next_case:
-               checkkwd = CHKNL | CHKKWD;
-               t = readtoken();
-               while (t != TESAC) {
-                       if (lasttoken == TLP)
-                               readtoken();
-                       *cpp = cp = stalloc(sizeof(struct nclist));
-                       cp->type = NCLIST;
-                       app = &cp->nclist.pattern;
-                       for (;;) {
-                               *app = ap = stalloc(sizeof(struct narg));
-                               ap->type = NARG;
-                               ap->narg.text = wordtext;
-                               ap->narg.backquote = backquotelist;
-                               if (readtoken() != TPIPE)
-                                       break;
-                               app = &ap->narg.next;
-                               readtoken();
-                       }
-                       ap->narg.next = NULL;
-                       if (lasttoken != TRP)
-                               raise_error_unexpected_syntax(TRP);
-                       cp->nclist.body = list(2);
+       *ap = NULL;
+       freeparam(&shellparam);
+       shellparam.malloc = 1;
+       shellparam.nparam = nparam;
+       shellparam.p = newparam;
+#if ENABLE_ASH_GETOPTS
+       shellparam.optind = 1;
+       shellparam.optoff = -1;
+#endif
+}
 
-                       cpp = &cp->nclist.next;
+/*
+ * Process shell options.  The global variable argptr contains a pointer
+ * to the argument list; we advance it past the options.
+ */
+static void
+minus_o(char *name, int val)
+{
+       int i;
 
-                       checkkwd = CHKNL | CHKKWD;
-                       t = readtoken();
-                       if (t != TESAC) {
-                               if (t != TENDCASE)
-                                       raise_error_unexpected_syntax(TENDCASE);
-                               goto next_case;
+       if (name) {
+               for (i = 0; i < NOPTS; i++) {
+                       if (strcmp(name, optnames(i)) == 0) {
+                               optlist[i] = val;
+                               return;
                        }
                }
-               *cpp = NULL;
-               goto redir;
-       case TLP:
-               n1 = stalloc(sizeof(struct nredir));
-               n1->type = NSUBSHELL;
-               n1->nredir.n = list(0);
-               n1->nredir.redirect = NULL;
-               t = TRP;
-               break;
-       case TBEGIN:
-               n1 = list(0);
-               t = TEND;
-               break;
-       case TWORD:
-       case TREDIR:
-               tokpushback++;
-               return simplecmd();
+               ash_msg_and_raise_error("illegal option -o %s", name);
        }
+       out1str("Current option settings\n");
+       for (i = 0; i < NOPTS; i++)
+               out1fmt("%-16s%s\n", optnames(i),
+                               optlist[i] ? "on" : "off");
+}
+static void
+setoption(int flag, int val)
+{
+       int i;
 
-       if (readtoken() != t)
-               raise_error_unexpected_syntax(t);
-
- redir:
-       /* Now check for redirection which may follow command */
-       checkkwd = CHKKWD | CHKALIAS;
-       rpp = rpp2;
-       while (readtoken() == TREDIR) {
-               *rpp = n2 = redirnode;
-               rpp = &n2->nfile.next;
-               parsefname();
+       for (i = 0; i < NOPTS; i++) {
+               if (optletters(i) == flag) {
+                       optlist[i] = val;
+                       return;
+               }
        }
-       tokpushback++;
-       *rpp = NULL;
-       if (redir) {
-               if (n1->type != NSUBSHELL) {
-                       n2 = stalloc(sizeof(struct nredir));
-                       n2->type = NREDIR;
-                       n2->nredir.n = n1;
-                       n1 = n2;
+       ash_msg_and_raise_error("illegal option -%c", flag);
+       /* NOTREACHED */
+}
+static void
+options(int cmdline)
+{
+       char *p;
+       int val;
+       int c;
+
+       if (cmdline)
+               minusc = NULL;
+       while ((p = *argptr) != NULL) {
+               c = *p++;
+               if (c != '-' && c != '+')
+                       break;
+               argptr++;
+               val = 0; /* val = 0 if c == '+' */
+               if (c == '-') {
+                       val = 1;
+                       if (p[0] == '\0' || LONE_DASH(p)) {
+                               if (!cmdline) {
+                                       /* "-" means turn off -x and -v */
+                                       if (p[0] == '\0')
+                                               xflag = vflag = 0;
+                                       /* "--" means reset params */
+                                       else if (*argptr == NULL)
+                                               setparam(argptr);
+                               }
+                               break;    /* "-" or  "--" terminates options */
+                       }
+               }
+               /* first char was + or - */
+               while ((c = *p++) != '\0') {
+                       /* bash 3.2 indeed handles -c CMD and +c CMD the same */
+                       if (c == 'c' && cmdline) {
+                               minusc = p;     /* command is after shell args */
+                       } else if (c == 'o') {
+                               minus_o(*argptr, val);
+                               if (*argptr)
+                                       argptr++;
+                       } else if (cmdline && (c == 'l')) { /* -l or +l == --login */
+                               isloginsh = 1;
+                       /* bash does not accept +-login, we also won't */
+                       } else if (cmdline && val && (c == '-')) { /* long options */
+                               if (strcmp(p, "login") == 0)
+                                       isloginsh = 1;
+                               break;
+                       } else {
+                               setoption(c, val);
+                       }
                }
-               n1->nredir.redirect = redir;
        }
-       return n1;
 }
 
 /*
- * If eofmark is NULL, read a word or a redirection symbol.  If eofmark
- * is not NULL, read a here document.  In the latter case, eofmark is the
- * word which marks the end of the document and striptabs is true if
- * leading tabs should be stripped from the document.  The argument firstc
- * is the first character of the input token or document.
- *
- * Because C does not have internal subroutines, I have simulated them
- * using goto's to implement the subroutine linkage.  The following macros
- * will run code that appears at the end of readtoken1.
+ * The shift builtin command.
  */
-
-#define CHECKEND()      {goto checkend; checkend_return:;}
-#define PARSEREDIR()    {goto parseredir; parseredir_return:;}
-#define PARSESUB()      {goto parsesub; parsesub_return:;}
-#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
-#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
-#define PARSEARITH()    {goto parsearith; parsearith_return:;}
-
 static int
-readtoken1(int firstc, int syntax, char *eofmark, int striptabs)
+shiftcmd(int argc, char **argv)
 {
-       int c = firstc;
-       char *out;
-       int len;
-       char line[EOFMARKLEN + 1];
-       struct nodelist *bqlist = 0;
-       int quotef = 0;
-       int dblquote = 0;
-       int varnest = 0;    /* levels of variables expansion */
-       int arinest = 0;    /* levels of arithmetic expansion */
-       int parenlevel = 0; /* levels of parens in arithmetic */
-       int dqvarnest = 0;  /* levels of variables expansion within double quotes */
-       int oldstyle = 0;
-       int prevsyntax = 0; /* syntax before arithmetic */
-#if __GNUC__
-       /* Avoid longjmp clobbering */
-       (void) &out;
-       (void) &quotef;
-       (void) &dblquote;
-       (void) &varnest;
-       (void) &arinest;
-       (void) &parenlevel;
-       (void) &dqvarnest;
-       (void) &oldstyle;
-       (void) &prevsyntax;
-       (void) &syntax;
-#endif
-
-       startlinno = plinno;
-       dblquote = 0;
-       if (syntax == DQSYNTAX)
-               dblquote = 1;
-       quotef = 0;
-       bqlist = NULL;
-       varnest = 0;
-       arinest = 0;
-       parenlevel = 0;
-       dqvarnest = 0;
-
-       STARTSTACKSTR(out);
-       loop: { /* for each line, until end of word */
-               CHECKEND();     /* set c to PEOF if at end of here document */
-               for (;;) {      /* until end of line or end of word */
-                       CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
-                       switch (SIT(c, syntax)) {
-                       case CNL:       /* '\n' */
-                               if (syntax == BASESYNTAX)
-                                       goto endword;   /* exit outer loop */
-                               USTPUTC(c, out);
-                               plinno++;
-                               if (doprompt)
-                                       setprompt(2);
-                               c = pgetc();
-                               goto loop;              /* continue outer loop */
-                       case CWORD:
-                               USTPUTC(c, out);
-                               break;
-                       case CCTL:
-                               if (eofmark == NULL || dblquote)
-                                       USTPUTC(CTLESC, out);
-                               USTPUTC(c, out);
-                               break;
-                       case CBACK:     /* backslash */
-                               c = pgetc2();
-                               if (c == PEOF) {
-                                       USTPUTC(CTLESC, out);
-                                       USTPUTC('\\', out);
-                                       pungetc();
-                               } else if (c == '\n') {
-                                       if (doprompt)
-                                               setprompt(2);
-                               } else {
-                                       if (dblquote &&
-                                               c != '\\' && c != '`' &&
-                                               c != '$' && (
-                                                       c != '"' ||
-                                                       eofmark != NULL)
-                                       ) {
-                                               USTPUTC(CTLESC, out);
-                                               USTPUTC('\\', out);
-                                       }
-                                       if (SIT(c, SQSYNTAX) == CCTL)
-                                               USTPUTC(CTLESC, out);
-                                       USTPUTC(c, out);
-                                       quotef++;
-                               }
-                               break;
-                       case CSQUOTE:
-                               syntax = SQSYNTAX;
- quotemark:
-                               if (eofmark == NULL) {
-                                       USTPUTC(CTLQUOTEMARK, out);
-                               }
-                               break;
-                       case CDQUOTE:
-                               syntax = DQSYNTAX;
-                               dblquote = 1;
-                               goto quotemark;
-                       case CENDQUOTE:
-                               if (eofmark != NULL && arinest == 0
-                                && varnest == 0
-                               ) {
-                                       USTPUTC(c, out);
-                               } else {
-                                       if (dqvarnest == 0) {
-                                               syntax = BASESYNTAX;
-                                               dblquote = 0;
-                                       }
-                                       quotef++;
-                                       goto quotemark;
-                               }
-                               break;
-                       case CVAR:      /* '$' */
-                               PARSESUB();             /* parse substitution */
-                               break;
-                       case CENDVAR:   /* '}' */
-                               if (varnest > 0) {
-                                       varnest--;
-                                       if (dqvarnest > 0) {
-                                               dqvarnest--;
-                                       }
-                                       USTPUTC(CTLENDVAR, out);
-                               } else {
-                                       USTPUTC(c, out);
-                               }
-                               break;
-#if ENABLE_ASH_MATH_SUPPORT
-                       case CLP:       /* '(' in arithmetic */
-                               parenlevel++;
-                               USTPUTC(c, out);
-                               break;
-                       case CRP:       /* ')' in arithmetic */
-                               if (parenlevel > 0) {
-                                       USTPUTC(c, out);
-                                       --parenlevel;
-                               } else {
-                                       if (pgetc() == ')') {
-                                               if (--arinest == 0) {
-                                                       USTPUTC(CTLENDARI, out);
-                                                       syntax = prevsyntax;
-                                                       if (syntax == DQSYNTAX)
-                                                               dblquote = 1;
-                                                       else
-                                                               dblquote = 0;
-                                               } else
-                                                       USTPUTC(')', out);
-                                       } else {
-                                               /*
-                                                * unbalanced parens
-                                                *  (don't 2nd guess - no error)
-                                                */
-                                               pungetc();
-                                               USTPUTC(')', out);
-                                       }
-                               }
-                               break;
-#endif
-                       case CBQUOTE:   /* '`' */
-                               PARSEBACKQOLD();
-                               break;
-                       case CENDFILE:
-                               goto endword;           /* exit outer loop */
-                       case CIGN:
-                               break;
-                       default:
-                               if (varnest == 0)
-                                       goto endword;   /* exit outer loop */
-#if ENABLE_ASH_ALIAS
-                               if (c != PEOA)
-#endif
-                                       USTPUTC(c, out);
+       int n;
+       char **ap1, **ap2;
 
-                       }
-                       c = pgetc_macro();
-               }
+       n = 1;
+       if (argc > 1)
+               n = number(argv[1]);
+       if (n > shellparam.nparam)
+               ash_msg_and_raise_error("can't shift that many");
+       INT_OFF;
+       shellparam.nparam -= n;
+       for (ap1 = shellparam.p; --n >= 0; ap1++) {
+               if (shellparam.malloc)
+                       free(*ap1);
        }
- endword:
-#if ENABLE_ASH_MATH_SUPPORT
-       if (syntax == ARISYNTAX)
-               raise_error_syntax("Missing '))'");
+       ap2 = shellparam.p;
+       while ((*ap2++ = *ap1++) != NULL);
+#if ENABLE_ASH_GETOPTS
+       shellparam.optind = 1;
+       shellparam.optoff = -1;
 #endif
-       if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
-               raise_error_syntax("Unterminated quoted string");
-       if (varnest != 0) {
-               startlinno = plinno;
-               /* { */
-               raise_error_syntax("Missing '}'");
-       }
-       USTPUTC('\0', out);
-       len = out - (char *)stackblock();
-       out = stackblock();
-       if (eofmark == NULL) {
-               if ((c == '>' || c == '<')
-                && quotef == 0
-                && len <= 2
-                && (*out == '\0' || isdigit(*out))) {
-                       PARSEREDIR();
-                       return lasttoken = TREDIR;
-               } else {
-                       pungetc();
-               }
-       }
-       quoteflag = quotef;
-       backquotelist = bqlist;
-       grabstackblock(len);
-       wordtext = out;
-       lasttoken = TWORD;
-       return lasttoken;
-/* end of readtoken routine */
-
+       INT_ON;
+       return 0;
+}
 
 /*
- * Check to see whether we are at the end of the here document.  When this
- * is called, c is set to the first character of the next input line.  If
- * we are at the end of the here document, this routine sets the c to PEOF.
+ * POSIX requires that 'set' (but not export or readonly) output the
+ * variables in lexicographic order - by the locale's collating order (sigh).
+ * Maybe we could keep them in an ordered balanced binary tree
+ * instead of hashed lists.
+ * For now just roll 'em through qsort for printing...
  */
-checkend: {
-       if (eofmark) {
-#if ENABLE_ASH_ALIAS
-               if (c == PEOA) {
-                       c = pgetc2();
-               }
-#endif
-               if (striptabs) {
-                       while (c == '\t') {
-                               c = pgetc2();
-                       }
-               }
-               if (c == *eofmark) {
-                       if (pfgets(line, sizeof(line)) != NULL) {
-                               char *p, *q;
+static int
+showvars(const char *sep_prefix, int on, int off)
+{
+       const char *sep;
+       char **ep, **epend;
 
-                               p = line;
-                               for (q = eofmark + 1; *q && *p == *q; p++, q++);
-                               if (*p == '\n' && *q == '\0') {
-                                       c = PEOF;
-                                       plinno++;
-                                       needprompt = doprompt;
-                               } else {
-                                       pushstring(line, NULL);
-                               }
-                       }
-               }
+       ep = listvars(on, off, &epend);
+       qsort(ep, epend - ep, sizeof(char *), vpcmp);
+
+       sep = *sep_prefix ? " " : sep_prefix;
+
+       for (; ep < epend; ep++) {
+               const char *p;
+               const char *q;
+
+               p = strchrnul(*ep, '=');
+               q = nullstr;
+               if (*p)
+                       q = single_quote(++p);
+               out1fmt("%s%s%.*s%s\n", sep_prefix, sep, (int)(p - *ep), *ep, q);
        }
-       goto checkend_return;
+       return 0;
 }
 
-
 /*
- * Parse a redirection operator.  The variable "out" points to a string
- * specifying the fd to be redirected.  The variable "c" contains the
- * first character of the redirection operator.
+ * The set command builtin.
  */
-parseredir: {
-       char fd = *out;
-       union node *np;
+static int
+setcmd(int argc, char **argv)
+{
+       if (argc == 1)
+               return showvars(nullstr, 0, VUNSET);
+       INT_OFF;
+       options(0);
+       optschanged();
+       if (*argptr != NULL) {
+               setparam(argptr);
+       }
+       INT_ON;
+       return 0;
+}
 
-       np = stalloc(sizeof(struct nfile));
-       if (c == '>') {
-               np->nfile.fd = 1;
-               c = pgetc();
-               if (c == '>')
-                       np->type = NAPPEND;
-               else if (c == '|')
-                       np->type = NCLOBBER;
-               else if (c == '&')
-                       np->type = NTOFD;
-               else {
-                       np->type = NTO;
-                       pungetc();
+#if ENABLE_ASH_RANDOM_SUPPORT
+/* Roughly copied from bash.. */
+static void
+change_random(const char *value)
+{
+       if (value == NULL) {
+               /* "get", generate */
+               char buf[16];
+
+               rseed = rseed * 1103515245 + 12345;
+               sprintf(buf, "%d", (unsigned int)((rseed & 32767)));
+               /* set without recursion */
+               setvar(vrandom.text, buf, VNOFUNC);
+               vrandom.flags &= ~VNOFUNC;
+       } else {
+               /* set/reset */
+               rseed = strtoul(value, (char **)NULL, 10);
+       }
+}
+#endif
+
+#if ENABLE_ASH_GETOPTS
+static int
+getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *optoff)
+{
+       char *p, *q;
+       char c = '?';
+       int done = 0;
+       int err = 0;
+       char s[12];
+       char **optnext;
+
+       if (*param_optind < 1)
+               return 1;
+       optnext = optfirst + *param_optind - 1;
+
+       if (*param_optind <= 1 || *optoff < 0 || strlen(optnext[-1]) < *optoff)
+               p = NULL;
+       else
+               p = optnext[-1] + *optoff;
+       if (p == NULL || *p == '\0') {
+               /* Current word is done, advance */
+               p = *optnext;
+               if (p == NULL || *p != '-' || *++p == '\0') {
+ atend:
+                       p = NULL;
+                       done = 1;
+                       goto out;
                }
-       } else {        /* c == '<' */
-               np->nfile.fd = 0;
-               c = pgetc();
-               switch (c) {
-               case '<':
-                       if (sizeof(struct nfile) != sizeof(struct nhere)) {
-                               np = stalloc(sizeof(struct nhere));
-                               np->nfile.fd = 0;
-                       }
-                       np->type = NHERE;
-                       heredoc = stalloc(sizeof(struct heredoc));
-                       heredoc->here = np;
-                       c = pgetc();
-                       if (c == '-') {
-                               heredoc->striptabs = 1;
+               optnext++;
+               if (LONE_DASH(p))        /* check for "--" */
+                       goto atend;
+       }
+
+       c = *p++;
+       for (q = optstr; *q != c; ) {
+               if (*q == '\0') {
+                       if (optstr[0] == ':') {
+                               s[0] = c;
+                               s[1] = '\0';
+                               err |= setvarsafe("OPTARG", s, 0);
                        } else {
-                               heredoc->striptabs = 0;
-                               pungetc();
+                               fprintf(stderr, "Illegal option -%c\n", c);
+                               unsetvar("OPTARG");
                        }
-                       break;
-
-               case '&':
-                       np->type = NFROMFD;
-                       break;
-
-               case '>':
-                       np->type = NFROMTO;
-                       break;
+                       c = '?';
+                       goto out;
+               }
+               if (*++q == ':')
+                       q++;
+       }
 
-               default:
-                       np->type = NFROM;
-                       pungetc();
-                       break;
+       if (*++q == ':') {
+               if (*p == '\0' && (p = *optnext) == NULL) {
+                       if (optstr[0] == ':') {
+                               s[0] = c;
+                               s[1] = '\0';
+                               err |= setvarsafe("OPTARG", s, 0);
+                               c = ':';
+                       } else {
+                               fprintf(stderr, "No arg for -%c option\n", c);
+                               unsetvar("OPTARG");
+                               c = '?';
+                       }
+                       goto out;
                }
+
+               if (p == *optnext)
+                       optnext++;
+               err |= setvarsafe("OPTARG", p, 0);
+               p = NULL;
+       } else
+               err |= setvarsafe("OPTARG", nullstr, 0);
+ out:
+       *optoff = p ? p - *(optnext - 1) : -1;
+       *param_optind = optnext - optfirst + 1;
+       fmtstr(s, sizeof(s), "%d", *param_optind);
+       err |= setvarsafe("OPTIND", s, VNOFUNC);
+       s[0] = c;
+       s[1] = '\0';
+       err |= setvarsafe(optvar, s, 0);
+       if (err) {
+               *param_optind = 1;
+               *optoff = -1;
+               flush_stdout_stderr();
+               raise_exception(EXERROR);
        }
-       if (fd != '\0')
-               np->nfile.fd = digit_val(fd);
-       redirnode = np;
-       goto parseredir_return;
+       return done;
 }
 
-
 /*
- * Parse a substitution.  At this point, we have read the dollar sign
- * and nothing else.
+ * The getopts builtin.  Shellparam.optnext points to the next argument
+ * to be processed.  Shellparam.optptr points to the next character to
+ * be processed in the current argument.  If shellparam.optnext is NULL,
+ * then it's the first time getopts has been called.
  */
-parsesub: {
-       int subtype;
-       int typeloc;
-       int flags;
-       char *p;
-       static const char types[] = "}-+?=";
+static int
+getoptscmd(int argc, char **argv)
+{
+       char **optbase;
 
-       c = pgetc();
-       if (
-               c <= PEOA_OR_PEOF  ||
-               (c != '(' && c != '{' && !is_name(c) && !is_special(c))
-       ) {
-               USTPUTC('$', out);
-               pungetc();
-       } else if (c == '(') {  /* $(command) or $((arith)) */
-               if (pgetc() == '(') {
-#if ENABLE_ASH_MATH_SUPPORT
-                       PARSEARITH();
-#else
-                       raise_error_syntax("We unsupport $((arith))");
-#endif
-               } else {
-                       pungetc();
-                       PARSEBACKQNEW();
+       if (argc < 3)
+               ash_msg_and_raise_error("usage: getopts optstring var [arg]");
+       if (argc == 3) {
+               optbase = shellparam.p;
+               if (shellparam.optind > shellparam.nparam + 1) {
+                       shellparam.optind = 1;
+                       shellparam.optoff = -1;
                }
        } else {
-               USTPUTC(CTLVAR, out);
-               typeloc = out - (char *)stackblock();
-               USTPUTC(VSNORMAL, out);
-               subtype = VSNORMAL;
-               if (c == '{') {
-                       c = pgetc();
-                       if (c == '#') {
-                               c = pgetc();
-                               if (c == '}')
-                                       c = '#';
-                               else
-                                       subtype = VSLENGTH;
-                       } else
-                               subtype = 0;
+               optbase = &argv[3];
+               if (shellparam.optind > argc - 2) {
+                       shellparam.optind = 1;
+                       shellparam.optoff = -1;
                }
-               if (c > PEOA_OR_PEOF && is_name(c)) {
-                       do {
-                               STPUTC(c, out);
-                               c = pgetc();
-                       } while (c > PEOA_OR_PEOF && is_in_name(c));
-               } else if (isdigit(c)) {
-                       do {
-                               STPUTC(c, out);
-                               c = pgetc();
-                       } while (isdigit(c));
-               } else if (is_special(c)) {
-                       USTPUTC(c, out);
-                       c = pgetc();
-               } else
- badsub:               raise_error_syntax("Bad substitution");
+       }
 
-               STPUTC('=', out);
-               flags = 0;
-               if (subtype == 0) {
-                       switch (c) {
-                       case ':':
-                               flags = VSNUL;
-                               c = pgetc();
-                               /*FALLTHROUGH*/
-                       default:
-                               p = strchr(types, c);
-                               if (p == NULL)
-                                       goto badsub;
-                               subtype = p - types + VSNORMAL;
-                               break;
-                       case '%':
-                       case '#':
-                               {
-                                       int cc = c;
-                                       subtype = c == '#' ? VSTRIMLEFT :
-                                                            VSTRIMRIGHT;
-                                       c = pgetc();
-                                       if (c == cc)
-                                               subtype++;
-                                       else
-                                               pungetc();
-                                       break;
-                               }
-                       }
-               } else {
-                       pungetc();
-               }
-               if (dblquote || arinest)
-                       flags |= VSQUOTE;
-               *((char *)stackblock() + typeloc) = subtype | flags;
-               if (subtype != VSNORMAL) {
-                       varnest++;
-                       if (dblquote || arinest) {
-                               dqvarnest++;
-                       }
-               }
-       }
-       goto parsesub_return;
+       return getopts(argv[1], argv[2], optbase, &shellparam.optind,
+                       &shellparam.optoff);
 }
+#endif /* ASH_GETOPTS */
 
 
+/* ============ Shell parser */
+
 /*
- * Called to parse command substitutions.  Newstyle is set if the command
- * is enclosed inside $(...); nlpp is a pointer to the head of the linked
- * list of commands (passed by reference), and savelen is the number of
- * characters on the top of the stack which must be preserved.
+ * NEOF is returned by parsecmd when it encounters an end of file.  It
+ * must be distinct from NULL, so we use the address of a variable that
+ * happens to be handy.
  */
-parsebackq: {
-       struct nodelist **nlpp;
-       int savepbq;
-       union node *n;
-       char *volatile str;
-       struct jmploc jmploc;
-       struct jmploc *volatile savehandler;
-       size_t savelen;
-       int saveprompt = 0;
-#ifdef __GNUC__
-       (void) &saveprompt;
-#endif
+static smallint tokpushback;           /* last token pushed back */
+#define NEOF ((union node *)&tokpushback)
+static smallint parsebackquote;        /* nonzero if we are inside backquotes */
+static int lasttoken;                  /* last token read */
+static char *wordtext;                 /* text of last word returned by readtoken */
+static struct nodelist *backquotelist;
+static union node *redirnode;
+static struct heredoc *heredoc;
+static smallint quoteflag;             /* set if (part of) last token was quoted */
 
-       savepbq = parsebackquote;
-       if (setjmp(jmploc.loc)) {
-               if (str)
-                       free(str);
-               parsebackquote = 0;
-               exception_handler = savehandler;
-               longjmp(exception_handler->loc, 1);
-       }
-       INT_OFF;
-       str = NULL;
-       savelen = out - (char *)stackblock();
-       if (savelen > 0) {
-               str = ckmalloc(savelen);
-               memcpy(str, stackblock(), savelen);
-       }
-       savehandler = exception_handler;
-       exception_handler = &jmploc;
-       INT_ON;
-       if (oldstyle) {
-               /* We must read until the closing backquote, giving special
-                  treatment to some slashes, and then push the string and
-                  reread it as input, interpreting it normally.  */
-               char *pout;
-               int pc;
-               size_t psavelen;
-               char *pstr;
+static void raise_error_syntax(const char *) ATTRIBUTE_NORETURN;
+static void
+raise_error_syntax(const char *msg)
+{
+       ash_msg_and_raise_error("syntax error: %s", msg);
+       /* NOTREACHED */
+}
 
+/*
+ * Called when an unexpected token is read during the parse.  The argument
+ * is the token that is expected, or -1 if more than one type of token can
+ * occur at this point.
+ */
+static void raise_error_unexpected_syntax(int) ATTRIBUTE_NORETURN;
+static void
+raise_error_unexpected_syntax(int token)
+{
+       char msg[64];
+       int l;
 
-               STARTSTACKSTR(pout);
-               for (;;) {
-                       if (needprompt) {
-                               setprompt(2);
-                       }
-                       pc = pgetc();
-                       switch (pc) {
-                       case '`':
-                               goto done;
+       l = sprintf(msg, "%s unexpected", tokname(lasttoken));
+       if (token >= 0)
+               sprintf(msg + l, " (expecting %s)", tokname(token));
+       raise_error_syntax(msg);
+       /* NOTREACHED */
+}
 
-                       case '\\':
-                               pc = pgetc();
-                               if (pc == '\n') {
-                                       plinno++;
-                                       if (doprompt)
-                                               setprompt(2);
-                                       /*
-                                        * If eating a newline, avoid putting
-                                        * the newline into the new character
-                                        * stream (via the STPUTC after the
-                                        * switch).
-                                        */
-                                       continue;
-                               }
-                               if (pc != '\\' && pc != '`' && pc != '$'
-                                && (!dblquote || pc != '"'))
-                                       STPUTC('\\', pout);
-                               if (pc > PEOA_OR_PEOF) {
-                                       break;
-                               }
-                               /* fall through */
+#define EOFMARKLEN 79
 
-                       case PEOF:
-#if ENABLE_ASH_ALIAS
-                       case PEOA:
-#endif
-                               startlinno = plinno;
-                               raise_error_syntax("EOF in backquote substitution");
+struct heredoc {
+       struct heredoc *next;   /* next here document in list */
+       union node *here;               /* redirection node */
+       char *eofmark;          /* string indicating end of input */
+       int striptabs;          /* if set, strip leading tabs */
+};
 
-                       case '\n':
-                               plinno++;
-                               needprompt = doprompt;
-                               break;
+static struct heredoc *heredoclist;    /* list of here documents to read */
 
-                       default:
-                               break;
+/* parsing is heavily cross-recursive, need these forward decls */
+static union node *andor(void);
+static union node *pipeline(void);
+static union node *parse_command(void);
+static void parseheredoc(void);
+static char peektoken(void);
+static int readtoken(void);
+
+static union node *
+list(int nlflag)
+{
+       union node *n1, *n2, *n3;
+       int tok;
+
+       checkkwd = CHKNL | CHKKWD | CHKALIAS;
+       if (nlflag == 2 && peektoken())
+               return NULL;
+       n1 = NULL;
+       for (;;) {
+               n2 = andor();
+               tok = readtoken();
+               if (tok == TBACKGND) {
+                       if (n2->type == NPIPE) {
+                               n2->npipe.backgnd = 1;
+                       } else {
+                               if (n2->type != NREDIR) {
+                                       n3 = stalloc(sizeof(struct nredir));
+                                       n3->nredir.n = n2;
+                                       n3->nredir.redirect = NULL;
+                                       n2 = n3;
+                               }
+                               n2->type = NBACKGND;
                        }
-                       STPUTC(pc, pout);
                }
- done:
-               STPUTC('\0', pout);
-               psavelen = pout - (char *)stackblock();
-               if (psavelen > 0) {
-                       pstr = grabstackstr(pout);
-                       setinputstring(pstr);
+               if (n1 == NULL) {
+                       n1 = n2;
+               } else {
+                       n3 = stalloc(sizeof(struct nbinary));
+                       n3->type = NSEMI;
+                       n3->nbinary.ch1 = n1;
+                       n3->nbinary.ch2 = n2;
+                       n1 = n3;
+               }
+               switch (tok) {
+               case TBACKGND:
+               case TSEMI:
+                       tok = readtoken();
+                       /* fall through */
+               case TNL:
+                       if (tok == TNL) {
+                               parseheredoc();
+                               if (nlflag == 1)
+                                       return n1;
+                       } else {
+                               tokpushback = 1;
+                       }
+                       checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                       if (peektoken())
+                               return n1;
+                       break;
+               case TEOF:
+                       if (heredoclist)
+                               parseheredoc();
+                       else
+                               pungetc();              /* push back EOF on input */
+                       return n1;
+               default:
+                       if (nlflag == 1)
+                               raise_error_unexpected_syntax(-1);
+                       tokpushback = 1;
+                       return n1;
                }
        }
-       nlpp = &bqlist;
-       while (*nlpp)
-               nlpp = &(*nlpp)->next;
-       *nlpp = stalloc(sizeof(**nlpp));
-       (*nlpp)->next = NULL;
-       parsebackquote = oldstyle;
-
-       if (oldstyle) {
-               saveprompt = doprompt;
-               doprompt = 0;
-       }
-
-       n = list(2);
+}
 
-       if (oldstyle)
-               doprompt = saveprompt;
-       else if (readtoken() != TRP)
-               raise_error_unexpected_syntax(TRP);
+static union node *
+andor(void)
+{
+       union node *n1, *n2, *n3;
+       int t;
 
-       (*nlpp)->n = n;
-       if (oldstyle) {
-               /*
-                * Start reading from old file again, ignoring any pushed back
-                * tokens left from the backquote parsing
-                */
-               popfile();
-               tokpushback = 0;
+       n1 = pipeline();
+       for (;;) {
+               t = readtoken();
+               if (t == TAND) {
+                       t = NAND;
+               } else if (t == TOR) {
+                       t = NOR;
+               } else {
+                       tokpushback = 1;
+                       return n1;
+               }
+               checkkwd = CHKNL | CHKKWD | CHKALIAS;
+               n2 = pipeline();
+               n3 = stalloc(sizeof(struct nbinary));
+               n3->type = t;
+               n3->nbinary.ch1 = n1;
+               n3->nbinary.ch2 = n2;
+               n1 = n3;
        }
-       while (stackblocksize() <= savelen)
-               growstackblock();
-       STARTSTACKSTR(out);
-       if (str) {
-               memcpy(out, str, savelen);
-               STADJUST(savelen, out);
-               INT_OFF;
-               free(str);
-               str = NULL;
-               INT_ON;
+}
+
+static union node *
+pipeline(void)
+{
+       union node *n1, *n2, *pipenode;
+       struct nodelist *lp, *prev;
+       int negate;
+
+       negate = 0;
+       TRACE(("pipeline: entered\n"));
+       if (readtoken() == TNOT) {
+               negate = !negate;
+               checkkwd = CHKKWD | CHKALIAS;
+       } else
+               tokpushback = 1;
+       n1 = parse_command();
+       if (readtoken() == TPIPE) {
+               pipenode = stalloc(sizeof(struct npipe));
+               pipenode->type = NPIPE;
+               pipenode->npipe.backgnd = 0;
+               lp = stalloc(sizeof(struct nodelist));
+               pipenode->npipe.cmdlist = lp;
+               lp->n = n1;
+               do {
+                       prev = lp;
+                       lp = stalloc(sizeof(struct nodelist));
+                       checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                       lp->n = parse_command();
+                       prev->next = lp;
+               } while (readtoken() == TPIPE);
+               lp->next = NULL;
+               n1 = pipenode;
+       }
+       tokpushback = 1;
+       if (negate) {
+               n2 = stalloc(sizeof(struct nnot));
+               n2->type = NNOT;
+               n2->nnot.com = n1;
+               return n2;
+       }
+       return n1;
+}
+
+static union node *
+makename(void)
+{
+       union node *n;
+
+       n = stalloc(sizeof(struct narg));
+       n->type = NARG;
+       n->narg.next = NULL;
+       n->narg.text = wordtext;
+       n->narg.backquote = backquotelist;
+       return n;
+}
+
+static void
+fixredir(union node *n, const char *text, int err)
+{
+       TRACE(("Fix redir %s %d\n", text, err));
+       if (!err)
+               n->ndup.vname = NULL;
+
+       if (isdigit(text[0]) && text[1] == '\0')
+               n->ndup.dupfd = text[0] - '0';
+       else if (LONE_DASH(text))
+               n->ndup.dupfd = -1;
+       else {
+               if (err)
+                       raise_error_syntax("Bad fd number");
+               n->ndup.vname = makename();
+       }
+}
+
+/*
+ * Returns true if the text contains nothing to expand (no dollar signs
+ * or backquotes).
+ */
+static int
+noexpand(char *text)
+{
+       char *p;
+       char c;
+
+       p = text;
+       while ((c = *p++) != '\0') {
+               if (c == CTLQUOTEMARK)
+                       continue;
+               if (c == CTLESC)
+                       p++;
+               else if (SIT(c, BASESYNTAX) == CCTL)
+                       return 0;
+       }
+       return 1;
+}
+
+static void
+parsefname(void)
+{
+       union node *n = redirnode;
+
+       if (readtoken() != TWORD)
+               raise_error_unexpected_syntax(-1);
+       if (n->type == NHERE) {
+               struct heredoc *here = heredoc;
+               struct heredoc *p;
+               int i;
+
+               if (quoteflag == 0)
+                       n->type = NXHERE;
+               TRACE(("Here document %d\n", n->type));
+               if (!noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
+                       raise_error_syntax("Illegal eof marker for << redirection");
+               rmescapes(wordtext);
+               here->eofmark = wordtext;
+               here->next = NULL;
+               if (heredoclist == NULL)
+                       heredoclist = here;
+               else {
+                       for (p = heredoclist; p->next; p = p->next);
+                       p->next = here;
+               }
+       } else if (n->type == NTOFD || n->type == NFROMFD) {
+               fixredir(n, wordtext, 0);
+       } else {
+               n->nfile.fname = makename();
+       }
+}
+
+static union node *
+simplecmd(void)
+{
+       union node *args, **app;
+       union node *n = NULL;
+       union node *vars, **vpp;
+       union node **rpp, *redir;
+       int savecheckkwd;
+
+       args = NULL;
+       app = &args;
+       vars = NULL;
+       vpp = &vars;
+       redir = NULL;
+       rpp = &redir;
+
+       savecheckkwd = CHKALIAS;
+       for (;;) {
+               checkkwd = savecheckkwd;
+               switch (readtoken()) {
+               case TWORD:
+                       n = stalloc(sizeof(struct narg));
+                       n->type = NARG;
+                       n->narg.text = wordtext;
+                       n->narg.backquote = backquotelist;
+                       if (savecheckkwd && isassignment(wordtext)) {
+                               *vpp = n;
+                               vpp = &n->narg.next;
+                       } else {
+                               *app = n;
+                               app = &n->narg.next;
+                               savecheckkwd = 0;
+                       }
+                       break;
+               case TREDIR:
+                       *rpp = n = redirnode;
+                       rpp = &n->nfile.next;
+                       parsefname();   /* read name of redirection file */
+                       break;
+               case TLP:
+                       if (args && app == &args->narg.next
+                        && !vars && !redir
+                       ) {
+                               struct builtincmd *bcmd;
+                               const char *name;
+
+                               /* We have a function */
+                               if (readtoken() != TRP)
+                                       raise_error_unexpected_syntax(TRP);
+                               name = n->narg.text;
+                               if (!goodname(name)
+                                || ((bcmd = find_builtin(name)) && IS_BUILTIN_SPECIAL(bcmd))
+                               ) {
+                                       raise_error_syntax("Bad function name");
+                               }
+                               n->type = NDEFUN;
+                               checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                               n->narg.next = parse_command();
+                               return n;
+                       }
+                       /* fall through */
+               default:
+                       tokpushback = 1;
+                       goto out;
+               }
+       }
+ out:
+       *app = NULL;
+       *vpp = NULL;
+       *rpp = NULL;
+       n = stalloc(sizeof(struct ncmd));
+       n->type = NCMD;
+       n->ncmd.args = args;
+       n->ncmd.assign = vars;
+       n->ncmd.redirect = redir;
+       return n;
+}
+
+static union node *
+parse_command(void)
+{
+       union node *n1, *n2;
+       union node *ap, **app;
+       union node *cp, **cpp;
+       union node *redir, **rpp;
+       union node **rpp2;
+       int t;
+
+       redir = NULL;
+       rpp2 = &redir;
+
+       switch (readtoken()) {
+       default:
+               raise_error_unexpected_syntax(-1);
+               /* NOTREACHED */
+       case TIF:
+               n1 = stalloc(sizeof(struct nif));
+               n1->type = NIF;
+               n1->nif.test = list(0);
+               if (readtoken() != TTHEN)
+                       raise_error_unexpected_syntax(TTHEN);
+               n1->nif.ifpart = list(0);
+               n2 = n1;
+               while (readtoken() == TELIF) {
+                       n2->nif.elsepart = stalloc(sizeof(struct nif));
+                       n2 = n2->nif.elsepart;
+                       n2->type = NIF;
+                       n2->nif.test = list(0);
+                       if (readtoken() != TTHEN)
+                               raise_error_unexpected_syntax(TTHEN);
+                       n2->nif.ifpart = list(0);
+               }
+               if (lasttoken == TELSE)
+                       n2->nif.elsepart = list(0);
+               else {
+                       n2->nif.elsepart = NULL;
+                       tokpushback = 1;
+               }
+               t = TFI;
+               break;
+       case TWHILE:
+       case TUNTIL: {
+               int got;
+               n1 = stalloc(sizeof(struct nbinary));
+               n1->type = (lasttoken == TWHILE) ? NWHILE : NUNTIL;
+               n1->nbinary.ch1 = list(0);
+               got = readtoken();
+               if (got != TDO) {
+                       TRACE(("expecting DO got %s %s\n", tokname(got),
+                                       got == TWORD ? wordtext : ""));
+                       raise_error_unexpected_syntax(TDO);
+               }
+               n1->nbinary.ch2 = list(0);
+               t = TDONE;
+               break;
+       }
+       case TFOR:
+               if (readtoken() != TWORD || quoteflag || ! goodname(wordtext))
+                       raise_error_syntax("Bad for loop variable");
+               n1 = stalloc(sizeof(struct nfor));
+               n1->type = NFOR;
+               n1->nfor.var = wordtext;
+               checkkwd = CHKKWD | CHKALIAS;
+               if (readtoken() == TIN) {
+                       app = &ap;
+                       while (readtoken() == TWORD) {
+                               n2 = stalloc(sizeof(struct narg));
+                               n2->type = NARG;
+                               n2->narg.text = wordtext;
+                               n2->narg.backquote = backquotelist;
+                               *app = n2;
+                               app = &n2->narg.next;
+                       }
+                       *app = NULL;
+                       n1->nfor.args = ap;
+                       if (lasttoken != TNL && lasttoken != TSEMI)
+                               raise_error_unexpected_syntax(-1);
+               } else {
+                       n2 = stalloc(sizeof(struct narg));
+                       n2->type = NARG;
+                       n2->narg.text = (char *)dolatstr;
+                       n2->narg.backquote = NULL;
+                       n2->narg.next = NULL;
+                       n1->nfor.args = n2;
+                       /*
+                        * Newline or semicolon here is optional (but note
+                        * that the original Bourne shell only allowed NL).
+                        */
+                       if (lasttoken != TNL && lasttoken != TSEMI)
+                               tokpushback = 1;
+               }
+               checkkwd = CHKNL | CHKKWD | CHKALIAS;
+               if (readtoken() != TDO)
+                       raise_error_unexpected_syntax(TDO);
+               n1->nfor.body = list(0);
+               t = TDONE;
+               break;
+       case TCASE:
+               n1 = stalloc(sizeof(struct ncase));
+               n1->type = NCASE;
+               if (readtoken() != TWORD)
+                       raise_error_unexpected_syntax(TWORD);
+               n1->ncase.expr = n2 = stalloc(sizeof(struct narg));
+               n2->type = NARG;
+               n2->narg.text = wordtext;
+               n2->narg.backquote = backquotelist;
+               n2->narg.next = NULL;
+               do {
+                       checkkwd = CHKKWD | CHKALIAS;
+               } while (readtoken() == TNL);
+               if (lasttoken != TIN)
+                       raise_error_unexpected_syntax(TIN);
+               cpp = &n1->ncase.cases;
+ next_case:
+               checkkwd = CHKNL | CHKKWD;
+               t = readtoken();
+               while (t != TESAC) {
+                       if (lasttoken == TLP)
+                               readtoken();
+                       *cpp = cp = stalloc(sizeof(struct nclist));
+                       cp->type = NCLIST;
+                       app = &cp->nclist.pattern;
+                       for (;;) {
+                               *app = ap = stalloc(sizeof(struct narg));
+                               ap->type = NARG;
+                               ap->narg.text = wordtext;
+                               ap->narg.backquote = backquotelist;
+                               if (readtoken() != TPIPE)
+                                       break;
+                               app = &ap->narg.next;
+                               readtoken();
+                       }
+                       ap->narg.next = NULL;
+                       if (lasttoken != TRP)
+                               raise_error_unexpected_syntax(TRP);
+                       cp->nclist.body = list(2);
+
+                       cpp = &cp->nclist.next;
+
+                       checkkwd = CHKNL | CHKKWD;
+                       t = readtoken();
+                       if (t != TESAC) {
+                               if (t != TENDCASE)
+                                       raise_error_unexpected_syntax(TENDCASE);
+                               goto next_case;
+                       }
+               }
+               *cpp = NULL;
+               goto redir;
+       case TLP:
+               n1 = stalloc(sizeof(struct nredir));
+               n1->type = NSUBSHELL;
+               n1->nredir.n = list(0);
+               n1->nredir.redirect = NULL;
+               t = TRP;
+               break;
+       case TBEGIN:
+               n1 = list(0);
+               t = TEND;
+               break;
+       case TWORD:
+       case TREDIR:
+               tokpushback = 1;
+               return simplecmd();
        }
-       parsebackquote = savepbq;
-       exception_handler = savehandler;
-       if (arinest || dblquote)
-               USTPUTC(CTLBACKQ | CTLQUOTE, out);
-       else
-               USTPUTC(CTLBACKQ, out);
-       if (oldstyle)
-               goto parsebackq_oldreturn;
-       goto parsebackq_newreturn;
-}
 
-#if ENABLE_ASH_MATH_SUPPORT
-/*
- * Parse an arithmetic expansion (indicate start of one and set state)
- */
-parsearith: {
-       if (++arinest == 1) {
-               prevsyntax = syntax;
-               syntax = ARISYNTAX;
-               USTPUTC(CTLARI, out);
-               if (dblquote)
-                       USTPUTC('"', out);
-               else
-                       USTPUTC(' ', out);
-       } else {
-               /*
-                * we collapse embedded arithmetic expansion to
-                * parenthesis, which should be equivalent
-                */
-               USTPUTC('(', out);
+       if (readtoken() != t)
+               raise_error_unexpected_syntax(t);
+
+ redir:
+       /* Now check for redirection which may follow command */
+       checkkwd = CHKKWD | CHKALIAS;
+       rpp = rpp2;
+       while (readtoken() == TREDIR) {
+               *rpp = n2 = redirnode;
+               rpp = &n2->nfile.next;
+               parsefname();
        }
-       goto parsearith_return;
+       tokpushback = 1;
+       *rpp = NULL;
+       if (redir) {
+               if (n1->type != NSUBSHELL) {
+                       n2 = stalloc(sizeof(struct nredir));
+                       n2->type = NREDIR;
+                       n2->nredir.n = n1;
+                       n1 = n2;
+               }
+               n1->nredir.redirect = redir;
+       }
+       return n1;
 }
-#endif
-
-} /* end of readtoken */
 
 /*
- * Read the next input token.
- * If the token is a word, we set backquotelist to the list of cmds in
- *      backquotes.  We set quoteflag to true if any part of the word was
- *      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.
+ * If eofmark is NULL, read a word or a redirection symbol.  If eofmark
+ * is not NULL, read a here document.  In the latter case, eofmark is the
+ * word which marks the end of the document and striptabs is true if
+ * leading tabs should be stripped from the document.  The argument firstc
+ * is the first character of the input token or document.
  *
- * [Change comment:  here documents and internal procedures]
- * [Readtoken shouldn't have any arguments.  Perhaps we should make the
- *  word parsing code into a separate routine.  In this case, readtoken
- *  doesn't need to have any internal procedures, but parseword does.
- *  We could also make parseoperator in essence the main routine, and
- *  have parseword (readtoken1?) handle both words and redirection.]
+ * Because C does not have internal subroutines, I have simulated them
+ * using goto's to implement the subroutine linkage.  The following macros
+ * will run code that appears at the end of readtoken1.
  */
-#define NEW_xxreadtoken
-#ifdef NEW_xxreadtoken
-/* singles must be first! */
-static const char xxreadtoken_chars[7] = { '\n', '(', ')', '&', '|', ';', 0 };
-
-static const char xxreadtoken_tokens[] = {
-       TNL, TLP, TRP,          /* only single occurrence allowed */
-       TBACKGND, TPIPE, TSEMI, /* if single occurrence */
-       TEOF,                   /* corresponds to trailing nul */
-       TAND, TOR, TENDCASE,    /* if double occurrence */
-};
 
-#define xxreadtoken_doubles \
-       (sizeof(xxreadtoken_tokens) - sizeof(xxreadtoken_chars))
-#define xxreadtoken_singles \
-       (sizeof(xxreadtoken_chars) - xxreadtoken_doubles - 1)
+#define CHECKEND()      {goto checkend; checkend_return:;}
+#define PARSEREDIR()    {goto parseredir; parseredir_return:;}
+#define PARSESUB()      {goto parsesub; parsesub_return:;}
+#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
+#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
+#define PARSEARITH()    {goto parsearith; parsearith_return:;}
 
 static int
-xxreadtoken(void)
+readtoken1(int firstc, int syntax, char *eofmark, int striptabs)
 {
-       int c;
+       /* NB: syntax parameter fits into smallint */
+       int c = firstc;
+       char *out;
+       int len;
+       char line[EOFMARKLEN + 1];
+       struct nodelist *bqlist;
+       smallint quotef;
+       smallint dblquote;
+       smallint oldstyle;
+       smallint prevsyntax; /* syntax before arithmetic */
+#if ENABLE_ASH_EXPAND_PRMT
+       smallint pssyntax;   /* we are expanding a prompt string */
+#endif
+       int varnest;         /* levels of variables expansion */
+       int arinest;         /* levels of arithmetic expansion */
+       int parenlevel;      /* levels of parens in arithmetic */
+       int dqvarnest;       /* levels of variables expansion within double quotes */
 
-       if (tokpushback) {
-               tokpushback = 0;
-               return lasttoken;
-       }
-       if (needprompt) {
-               setprompt(2);
-       }
+#if __GNUC__
+       /* Avoid longjmp clobbering */
+       (void) &out;
+       (void) &quotef;
+       (void) &dblquote;
+       (void) &varnest;
+       (void) &arinest;
+       (void) &parenlevel;
+       (void) &dqvarnest;
+       (void) &oldstyle;
+       (void) &prevsyntax;
+       (void) &syntax;
+#endif
        startlinno = plinno;
-       for (;;) {                      /* until token or start of word found */
-               c = pgetc_macro();
-
-               if ((c != ' ') && (c != '\t')
-#if ENABLE_ASH_ALIAS
-                && (c != PEOA)
+       bqlist = NULL;
+       quotef = 0;
+       oldstyle = 0;
+       prevsyntax = 0;
+#if ENABLE_ASH_EXPAND_PRMT
+       pssyntax = (syntax == PSSYNTAX);
+       if (pssyntax)
+               syntax = DQSYNTAX;
 #endif
-               ) {
-                       if (c == '#') {
-                               while ((c = pgetc()) != '\n' && c != PEOF);
-                               pungetc();
-                       } else if (c == '\\') {
-                               if (pgetc() != '\n') {
-                                       pungetc();
-                                       goto READTOKEN1;
-                               }
-                               startlinno = ++plinno;
+       dblquote = (syntax == DQSYNTAX);
+       varnest = 0;
+       arinest = 0;
+       parenlevel = 0;
+       dqvarnest = 0;
+
+       STARTSTACKSTR(out);
+       loop: { /* for each line, until end of word */
+               CHECKEND();     /* set c to PEOF if at end of here document */
+               for (;;) {      /* until end of line or end of word */
+                       CHECKSTRSPACE(4, out);  /* permit 4 calls to USTPUTC */
+                       switch (SIT(c, syntax)) {
+                       case CNL:       /* '\n' */
+                               if (syntax == BASESYNTAX)
+                                       goto endword;   /* exit outer loop */
+                               USTPUTC(c, out);
+                               plinno++;
                                if (doprompt)
                                        setprompt(2);
-                       } else {
-                               const char *p
-                                       = xxreadtoken_chars + sizeof(xxreadtoken_chars) - 1;
-
-                               if (c != PEOF) {
-                                       if (c == '\n') {
-                                               plinno++;
-                                               needprompt = doprompt;
+                               c = pgetc();
+                               goto loop;              /* continue outer loop */
+                       case CWORD:
+                               USTPUTC(c, out);
+                               break;
+                       case CCTL:
+                               if (eofmark == NULL || dblquote)
+                                       USTPUTC(CTLESC, out);
+                               USTPUTC(c, out);
+                               break;
+                       case CBACK:     /* backslash */
+                               c = pgetc2();
+                               if (c == PEOF) {
+                                       USTPUTC(CTLESC, out);
+                                       USTPUTC('\\', out);
+                                       pungetc();
+                               } else if (c == '\n') {
+                                       if (doprompt)
+                                               setprompt(2);
+                               } else {
+#if ENABLE_ASH_EXPAND_PRMT
+                                       if (c == '$' && pssyntax) {
+                                               USTPUTC(CTLESC, out);
+                                               USTPUTC('\\', out);
                                        }
-
-                                       p = strchr(xxreadtoken_chars, c);
-                                       if (p == NULL) {
- READTOKEN1:
-                                               return readtoken1(c, BASESYNTAX, (char *) NULL, 0);
+#endif
+                                       if (dblquote &&
+                                               c != '\\' && c != '`' &&
+                                               c != '$' && (
+                                                       c != '"' ||
+                                                       eofmark != NULL)
+                                       ) {
+                                               USTPUTC(CTLESC, out);
+                                               USTPUTC('\\', out);
+                                       }
+                                       if (SIT(c, SQSYNTAX) == CCTL)
+                                               USTPUTC(CTLESC, out);
+                                       USTPUTC(c, out);
+                                       quotef = 1;
+                               }
+                               break;
+                       case CSQUOTE:
+                               syntax = SQSYNTAX;
+ quotemark:
+                               if (eofmark == NULL) {
+                                       USTPUTC(CTLQUOTEMARK, out);
+                               }
+                               break;
+                       case CDQUOTE:
+                               syntax = DQSYNTAX;
+                               dblquote = 1;
+                               goto quotemark;
+                       case CENDQUOTE:
+                               if (eofmark != NULL && arinest == 0
+                                && varnest == 0
+                               ) {
+                                       USTPUTC(c, out);
+                               } else {
+                                       if (dqvarnest == 0) {
+                                               syntax = BASESYNTAX;
+                                               dblquote = 0;
+                                       }
+                                       quotef = 1;
+                                       goto quotemark;
+                               }
+                               break;
+                       case CVAR:      /* '$' */
+                               PARSESUB();             /* parse substitution */
+                               break;
+                       case CENDVAR:   /* '}' */
+                               if (varnest > 0) {
+                                       varnest--;
+                                       if (dqvarnest > 0) {
+                                               dqvarnest--;
                                        }
-
-                                       if (p - xxreadtoken_chars >= xxreadtoken_singles) {
-                                               if (pgetc() == *p) {    /* double occurrence? */
-                                                       p += xxreadtoken_doubles + 1;
-                                               } else {
-                                                       pungetc();
-                                               }
+                                       USTPUTC(CTLENDVAR, out);
+                               } else {
+                                       USTPUTC(c, out);
+                               }
+                               break;
+#if ENABLE_ASH_MATH_SUPPORT
+                       case CLP:       /* '(' in arithmetic */
+                               parenlevel++;
+                               USTPUTC(c, out);
+                               break;
+                       case CRP:       /* ')' in arithmetic */
+                               if (parenlevel > 0) {
+                                       USTPUTC(c, out);
+                                       --parenlevel;
+                               } else {
+                                       if (pgetc() == ')') {
+                                               if (--arinest == 0) {
+                                                       USTPUTC(CTLENDARI, out);
+                                                       syntax = prevsyntax;
+                                                       dblquote = (syntax == DQSYNTAX);
+                                               } else
+                                                       USTPUTC(')', out);
+                                       } else {
+                                               /*
+                                                * unbalanced parens
+                                                *  (don't 2nd guess - no error)
+                                                */
+                                               pungetc();
+                                               USTPUTC(')', out);
                                        }
                                }
-                               return lasttoken = xxreadtoken_tokens[p - xxreadtoken_chars];
-                       }
-               }
-       } /* for */
-}
-#else
-#define RETURN(token)   return lasttoken = token
-static int
-xxreadtoken(void)
-{
-       int c;
-
-       if (tokpushback) {
-               tokpushback = 0;
-               return lasttoken;
-       }
-       if (needprompt) {
-               setprompt(2);
-       }
-       startlinno = plinno;
-       for (;;) {      /* until token or start of word found */
-               c = pgetc_macro();
-               switch (c) {
-               case ' ': case '\t':
-#if ENABLE_ASH_ALIAS
-               case PEOA:
-#endif
-                       continue;
-               case '#':
-                       while ((c = pgetc()) != '\n' && c != PEOF);
-                       pungetc();
-                       continue;
-               case '\\':
-                       if (pgetc() == '\n') {
-                               startlinno = ++plinno;
-                               if (doprompt)
-                                       setprompt(2);
-                               continue;
-                       }
-                       pungetc();
-                       goto breakloop;
-               case '\n':
-                       plinno++;
-                       needprompt = doprompt;
-                       RETURN(TNL);
-               case PEOF:
-                       RETURN(TEOF);
-               case '&':
-                       if (pgetc() == '&')
-                               RETURN(TAND);
-                       pungetc();
-                       RETURN(TBACKGND);
-               case '|':
-                       if (pgetc() == '|')
-                               RETURN(TOR);
-                       pungetc();
-                       RETURN(TPIPE);
-               case ';':
-                       if (pgetc() == ';')
-                               RETURN(TENDCASE);
-                       pungetc();
-                       RETURN(TSEMI);
-               case '(':
-                       RETURN(TLP);
-               case ')':
-                       RETURN(TRP);
-               default:
-                       goto breakloop;
-               }
-       }
- breakloop:
-       return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
-#undef RETURN
-}
-#endif /* NEW_xxreadtoken */
-
-static int
-readtoken(void)
-{
-       int t;
-#if DEBUG
-       int alreadyseen = tokpushback;
+                               break;
 #endif
-
+                       case CBQUOTE:   /* '`' */
+                               PARSEBACKQOLD();
+                               break;
+                       case CENDFILE:
+                               goto endword;           /* exit outer loop */
+                       case CIGN:
+                               break;
+                       default:
+                               if (varnest == 0)
+                                       goto endword;   /* exit outer loop */
 #if ENABLE_ASH_ALIAS
- top:
+                               if (c != PEOA)
 #endif
+                                       USTPUTC(c, out);
 
-       t = xxreadtoken();
-
-       /*
-        * eat newlines
-        */
-       if (checkkwd & CHKNL) {
-               while (t == TNL) {
-                       parseheredoc();
-                       t = xxreadtoken();
-               }
-       }
-
-       if (t != TWORD || quoteflag) {
-               goto out;
-       }
-
-       /*
-        * check for keywords
-        */
-       if (checkkwd & CHKKWD) {
-               const char *const *pp;
-
-               pp = findkwd(wordtext);
-               if (pp) {
-                       lasttoken = t = pp - tokname_array;
-                       TRACE(("keyword %s recognized\n", tokname(t)));
-                       goto out;
-               }
-       }
-
-       if (checkkwd & CHKALIAS) {
-#if ENABLE_ASH_ALIAS
-               struct alias *ap;
-               ap = lookupalias(wordtext, 1);
-               if (ap != NULL) {
-                       if (*ap->val) {
-                               pushstring(ap->val, ap);
                        }
-                       goto top;
+                       c = pgetc_macro();
                }
-#endif
        }
- out:
-       checkkwd = 0;
-#if DEBUG
-       if (!alreadyseen)
-               TRACE(("token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
-       else
-               TRACE(("reread token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
+ endword:
+#if ENABLE_ASH_MATH_SUPPORT
+       if (syntax == ARISYNTAX)
+               raise_error_syntax("Missing '))'");
 #endif
-       return t;
-}
-
-static char
-peektoken(void)
-{
-       int t;
-
-       t = readtoken();
-       tokpushback++;
-       return tokname_array[t][0];
-}
-
-/*
- * Read and parse a command.  Returns NEOF on end of file.  (NULL is a
- * valid parse tree indicating a blank line.)
- */
-static union node *
-parsecmd(int interact)
-{
-       int t;
-
-       tokpushback = 0;
-       doprompt = interact;
-       if (doprompt)
-               setprompt(doprompt);
-       needprompt = 0;
-       t = readtoken();
-       if (t == TEOF)
-               return NEOF;
-       if (t == TNL)
-               return NULL;
-       tokpushback++;
-       return list(1);
-}
-
-/*
- * Input any here documents.
- */
-static void
-parseheredoc(void)
-{
-       struct heredoc *here;
-       union node *n;
-
-       here = heredoclist;
-       heredoclist = 0;
-
-       while (here) {
-               if (needprompt) {
-                       setprompt(2);
-               }
-               readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX,
-                               here->eofmark, here->striptabs);
-               n = stalloc(sizeof(struct narg));
-               n->narg.type = NARG;
-               n->narg.next = NULL;
-               n->narg.text = wordtext;
-               n->narg.backquote = backquotelist;
-               here->here->nhere.doc = n;
-               here = here->next;
+       if (syntax != BASESYNTAX && !parsebackquote && eofmark == NULL)
+               raise_error_syntax("Unterminated quoted string");
+       if (varnest != 0) {
+               startlinno = plinno;
+               /* { */
+               raise_error_syntax("Missing '}'");
+       }
+       USTPUTC('\0', out);
+       len = out - (char *)stackblock();
+       out = stackblock();
+       if (eofmark == NULL) {
+               if ((c == '>' || c == '<')
+                && quotef == 0
+                && len <= 2
+                && (*out == '\0' || isdigit(*out))) {
+                       PARSEREDIR();
+                       return lasttoken = TREDIR;
+               } else {
+                       pungetc();
+               }
        }
-}
-
+       quoteflag = quotef;
+       backquotelist = bqlist;
+       grabstackblock(len);
+       wordtext = out;
+       lasttoken = TWORD;
+       return lasttoken;
+/* end of readtoken routine */
 
 /*
- * called by editline -- any expansions to the prompt
- *    should be added here.
+ * Check to see whether we are at the end of the here document.  When this
+ * is called, c is set to the first character of the next input line.  If
+ * we are at the end of the here document, this routine sets the c to PEOF.
  */
-#if ENABLE_ASH_EXPAND_PRMT
-static const char *
-expandstr(const char *ps)
-{
-       union node n;
-
-       /* XXX Fix (char *) cast. */
-       setinputstring((char *)ps);
-       readtoken1(pgetc(), DQSYNTAX, nullstr, 0);
-       popfile();
-
-       n.narg.type = NARG;
-       n.narg.next = NULL;
-       n.narg.text = wordtext;
-       n.narg.backquote = backquotelist;
-
-       expandarg(&n, NULL, 0);
-       return stackblock();
-}
+checkend: {
+       if (eofmark) {
+#if ENABLE_ASH_ALIAS
+               if (c == PEOA) {
+                       c = pgetc2();
+               }
 #endif
+               if (striptabs) {
+                       while (c == '\t') {
+                               c = pgetc2();
+                       }
+               }
+               if (c == *eofmark) {
+                       if (pfgets(line, sizeof(line)) != NULL) {
+                               char *p, *q;
 
+                               p = line;
+                               for (q = eofmark + 1; *q && *p == *q; p++, q++);
+                               if (*p == '\n' && *q == '\0') {
+                                       c = PEOF;
+                                       plinno++;
+                                       needprompt = doprompt;
+                               } else {
+                                       pushstring(line, NULL);
+                               }
+                       }
+               }
+       }
+       goto checkend_return;
+}
 
 /*
- * Execute a command or commands contained in a string.
+ * Parse a redirection operator.  The variable "out" points to a string
+ * specifying the fd to be redirected.  The variable "c" contains the
+ * first character of the redirection operator.
  */
-static int
-evalstring(char *s, int mask)
-{
-       union node *n;
-       struct stackmark smark;
-       int skip;
-
-       setinputstring(s);
-       setstackmark(&smark);
+parseredir: {
+       char fd = *out;
+       union node *np;
 
-       skip = 0;
-       while ((n = parsecmd(0)) != NEOF) {
-               evaltree(n, 0);
-               popstackmark(&smark);
-               skip = evalskip;
-               if (skip)
+       np = stalloc(sizeof(struct nfile));
+       if (c == '>') {
+               np->nfile.fd = 1;
+               c = pgetc();
+               if (c == '>')
+                       np->type = NAPPEND;
+               else if (c == '|')
+                       np->type = NCLOBBER;
+               else if (c == '&')
+                       np->type = NTOFD;
+               else {
+                       np->type = NTO;
+                       pungetc();
+               }
+       } else {        /* c == '<' */
+               np->nfile.fd = 0;
+               c = pgetc();
+               switch (c) {
+               case '<':
+                       if (sizeof(struct nfile) != sizeof(struct nhere)) {
+                               np = stalloc(sizeof(struct nhere));
+                               np->nfile.fd = 0;
+                       }
+                       np->type = NHERE;
+                       heredoc = stalloc(sizeof(struct heredoc));
+                       heredoc->here = np;
+                       c = pgetc();
+                       if (c == '-') {
+                               heredoc->striptabs = 1;
+                       } else {
+                               heredoc->striptabs = 0;
+                               pungetc();
+                       }
                        break;
-       }
-       popfile();
 
-       skip &= mask;
-       evalskip = skip;
-       return skip;
-}
+               case '&':
+                       np->type = NFROMFD;
+                       break;
 
-/*
- * The eval command.
- */
-static int
-evalcmd(int argc, char **argv)
-{
-       char *p;
-       char *concat;
-       char **ap;
+               case '>':
+                       np->type = NFROMTO;
+                       break;
 
-       if (argc > 1) {
-               p = argv[1];
-               if (argc > 2) {
-                       STARTSTACKSTR(concat);
-                       ap = argv + 2;
-                       for (;;) {
-                               concat = stack_putstr(p, concat);
-                               p = *ap++;
-                               if (p == NULL)
-                                       break;
-                               STPUTC(' ', concat);
-                       }
-                       STPUTC('\0', concat);
-                       p = grabstackstr(concat);
+               default:
+                       np->type = NFROM;
+                       pungetc();
+                       break;
                }
-               evalstring(p, ~SKIPEVAL);
-
        }
-       return exitstatus;
+       if (fd != '\0')
+               np->nfile.fd = fd - '0';
+       redirnode = np;
+       goto parseredir_return;
 }
 
 /*
- * Read and execute commands.  "Top" is nonzero for the top level command
- * loop; it turns on prompting if the shell is interactive.
+ * Parse a substitution.  At this point, we have read the dollar sign
+ * and nothing else.
  */
-static int
-cmdloop(int top)
-{
-       union node *n;
-       struct stackmark smark;
-       int inter;
-       int numeof = 0;
 
-       TRACE(("cmdloop(%d) called\n", top));
-       for (;;) {
-               int skip;
+/* is_special(c) evaluates to 1 for c in "!#$*-0123456789?@"; 0 otherwise
+ * (assuming ascii char codes, as the original implementation did) */
+#define is_special(c) \
+       ((((unsigned int)c) - 33 < 32) \
+                       && ((0xc1ff920dUL >> (((unsigned int)c) - 33)) & 1))
+parsesub: {
+       int subtype;
+       int typeloc;
+       int flags;
+       char *p;
+       static const char types[] ALIGN1 = "}-+?=";
 
-               setstackmark(&smark);
-#if JOBS
-               if (jobctl)
-                       showjobs(stderr, SHOW_CHANGED);
-#endif
-               inter = 0;
-               if (iflag && top) {
-                       inter++;
-#if ENABLE_ASH_MAIL
-                       chkmail();
+       c = pgetc();
+       if (
+               c <= PEOA_OR_PEOF  ||
+               (c != '(' && c != '{' && !is_name(c) && !is_special(c))
+       ) {
+               USTPUTC('$', out);
+               pungetc();
+       } else if (c == '(') {  /* $(command) or $((arith)) */
+               if (pgetc() == '(') {
+#if ENABLE_ASH_MATH_SUPPORT
+                       PARSEARITH();
+#else
+                       raise_error_syntax("We unsupport $((arith))");
 #endif
+               } else {
+                       pungetc();
+                       PARSEBACKQNEW();
                }
-               n = parsecmd(inter);
-               /* showtree(n); DEBUG */
-               if (n == NEOF) {
-                       if (!top || numeof >= 50)
+       } else {
+               USTPUTC(CTLVAR, out);
+               typeloc = out - (char *)stackblock();
+               USTPUTC(VSNORMAL, out);
+               subtype = VSNORMAL;
+               if (c == '{') {
+                       c = pgetc();
+                       if (c == '#') {
+                               c = pgetc();
+                               if (c == '}')
+                                       c = '#';
+                               else
+                                       subtype = VSLENGTH;
+                       } else
+                               subtype = 0;
+               }
+               if (c > PEOA_OR_PEOF && is_name(c)) {
+                       do {
+                               STPUTC(c, out);
+                               c = pgetc();
+                       } while (c > PEOA_OR_PEOF && is_in_name(c));
+               } else if (isdigit(c)) {
+                       do {
+                               STPUTC(c, out);
+                               c = pgetc();
+                       } while (isdigit(c));
+               } else if (is_special(c)) {
+                       USTPUTC(c, out);
+                       c = pgetc();
+               } else
+ badsub:               raise_error_syntax("Bad substitution");
+
+               STPUTC('=', out);
+               flags = 0;
+               if (subtype == 0) {
+                       switch (c) {
+                       case ':':
+                               flags = VSNUL;
+                               c = pgetc();
+                               /*FALLTHROUGH*/
+                       default:
+                               p = strchr(types, c);
+                               if (p == NULL)
+                                       goto badsub;
+                               subtype = p - types + VSNORMAL;
                                break;
-                       if (!stoppedjobs()) {
-                               if (!Iflag)
+                       case '%':
+                       case '#':
+                               {
+                                       int cc = c;
+                                       subtype = c == '#' ? VSTRIMLEFT :
+                                                            VSTRIMRIGHT;
+                                       c = pgetc();
+                                       if (c == cc)
+                                               subtype++;
+                                       else
+                                               pungetc();
                                        break;
-                               out2str("\nUse \"exit\" to leave shell.\n");
+                               }
                        }
-                       numeof++;
-               } else if (nflag == 0) {
-                       job_warning = (job_warning == 2) ? 1 : 0;
-                       numeof = 0;
-                       evaltree(n, 0);
+               } else {
+                       pungetc();
                }
-               popstackmark(&smark);
-               skip = evalskip;
-
-               if (skip) {
-                       evalskip = 0;
-                       return skip & SKIPEVAL;
+               if (dblquote || arinest)
+                       flags |= VSQUOTE;
+               *((char *)stackblock() + typeloc) = subtype | flags;
+               if (subtype != VSNORMAL) {
+                       varnest++;
+                       if (dblquote || arinest) {
+                               dqvarnest++;
+                       }
                }
        }
-       return 0;
+       goto parsesub_return;
 }
 
-static int
-dotcmd(int argc, char **argv)
-{
-       struct strlist *sp;
-       volatile struct shparam saveparam;
-       int status = 0;
+/*
+ * Called to parse command substitutions.  Newstyle is set if the command
+ * is enclosed inside $(...); nlpp is a pointer to the head of the linked
+ * list of commands (passed by reference), and savelen is the number of
+ * characters on the top of the stack which must be preserved.
+ */
+parsebackq: {
+       struct nodelist **nlpp;
+       smallint savepbq;
+       union node *n;
+       char *volatile str;
+       struct jmploc jmploc;
+       struct jmploc *volatile savehandler;
+       size_t savelen;
+       smallint saveprompt = 0;
 
-       for (sp = cmdenviron; sp; sp = sp->next)
-               setvareq(xstrdup(sp->text), VSTRFIXED | VTEXTFIXED);
+#ifdef __GNUC__
+       (void) &saveprompt;
+#endif
+       savepbq = parsebackquote;
+       if (setjmp(jmploc.loc)) {
+               free(str);
+               parsebackquote = 0;
+               exception_handler = savehandler;
+               longjmp(exception_handler->loc, 1);
+       }
+       INT_OFF;
+       str = NULL;
+       savelen = out - (char *)stackblock();
+       if (savelen > 0) {
+               str = ckmalloc(savelen);
+               memcpy(str, stackblock(), savelen);
+       }
+       savehandler = exception_handler;
+       exception_handler = &jmploc;
+       INT_ON;
+       if (oldstyle) {
+               /* We must read until the closing backquote, giving special
+                  treatment to some slashes, and then push the string and
+                  reread it as input, interpreting it normally.  */
+               char *pout;
+               int pc;
+               size_t psavelen;
+               char *pstr;
 
-       if (argc >= 2) {        /* That's what SVR2 does */
-               char *fullname;
 
-               fullname = find_dot_file(argv[1]);
+               STARTSTACKSTR(pout);
+               for (;;) {
+                       if (needprompt) {
+                               setprompt(2);
+                       }
+                       pc = pgetc();
+                       switch (pc) {
+                       case '`':
+                               goto done;
 
-               if (argc > 2) {
-                       saveparam = shellparam;
-                       shellparam.malloc = 0;
-                       shellparam.nparam = argc - 2;
-                       shellparam.p = argv + 2;
-               };
+                       case '\\':
+                               pc = pgetc();
+                               if (pc == '\n') {
+                                       plinno++;
+                                       if (doprompt)
+                                               setprompt(2);
+                                       /*
+                                        * If eating a newline, avoid putting
+                                        * the newline into the new character
+                                        * stream (via the STPUTC after the
+                                        * switch).
+                                        */
+                                       continue;
+                               }
+                               if (pc != '\\' && pc != '`' && pc != '$'
+                                && (!dblquote || pc != '"'))
+                                       STPUTC('\\', pout);
+                               if (pc > PEOA_OR_PEOF) {
+                                       break;
+                               }
+                               /* fall through */
 
-               setinputfile(fullname, INPUT_PUSH_FILE);
-               commandname = fullname;
-               cmdloop(0);
-               popfile();
+                       case PEOF:
+#if ENABLE_ASH_ALIAS
+                       case PEOA:
+#endif
+                               startlinno = plinno;
+                               raise_error_syntax("EOF in backquote substitution");
 
-               if (argc > 2) {
-                       freeparam(&shellparam);
-                       shellparam = saveparam;
-               };
-               status = exitstatus;
+                       case '\n':
+                               plinno++;
+                               needprompt = doprompt;
+                               break;
+
+                       default:
+                               break;
+                       }
+                       STPUTC(pc, pout);
+               }
+ done:
+               STPUTC('\0', pout);
+               psavelen = pout - (char *)stackblock();
+               if (psavelen > 0) {
+                       pstr = grabstackstr(pout);
+                       setinputstring(pstr);
+               }
        }
-       return status;
-}
+       nlpp = &bqlist;
+       while (*nlpp)
+               nlpp = &(*nlpp)->next;
+       *nlpp = stalloc(sizeof(**nlpp));
+       (*nlpp)->next = NULL;
+       parsebackquote = oldstyle;
 
-static int
-exitcmd(int argc, char **argv)
-{
-       if (stoppedjobs())
-               return 0;
-       if (argc > 1)
-               exitstatus = number(argv[1]);
-       raise_exception(EXEXIT);
-       /* NOTREACHED */
-}
+       if (oldstyle) {
+               saveprompt = doprompt;
+               doprompt = 0;
+       }
 
-#if ENABLE_ASH_BUILTIN_ECHO
-static int
-echocmd(int argc, char **argv)
-{
-       return bb_echo(argv);
-}
-#endif
+       n = list(2);
 
-#if ENABLE_ASH_BUILTIN_TEST
-static int
-testcmd(int argc, char **argv)
-{
-       return bb_test(argc, argv);
+       if (oldstyle)
+               doprompt = saveprompt;
+       else if (readtoken() != TRP)
+               raise_error_unexpected_syntax(TRP);
+
+       (*nlpp)->n = n;
+       if (oldstyle) {
+               /*
+                * Start reading from old file again, ignoring any pushed back
+                * tokens left from the backquote parsing
+                */
+               popfile();
+               tokpushback = 0;
+       }
+       while (stackblocksize() <= savelen)
+               growstackblock();
+       STARTSTACKSTR(out);
+       if (str) {
+               memcpy(out, str, savelen);
+               STADJUST(savelen, out);
+               INT_OFF;
+               free(str);
+               str = NULL;
+               INT_ON;
+       }
+       parsebackquote = savepbq;
+       exception_handler = savehandler;
+       if (arinest || dblquote)
+               USTPUTC(CTLBACKQ | CTLQUOTE, out);
+       else
+               USTPUTC(CTLBACKQ, out);
+       if (oldstyle)
+               goto parsebackq_oldreturn;
+       goto parsebackq_newreturn;
 }
-#endif
 
+#if ENABLE_ASH_MATH_SUPPORT
 /*
- * Read a file containing shell functions.
+ * Parse an arithmetic expansion (indicate start of one and set state)
  */
-static void
-readcmdfile(char *name)
-{
-       setinputfile(name, INPUT_PUSH_FILE);
-       cmdloop(0);
-       popfile();
+parsearith: {
+       if (++arinest == 1) {
+               prevsyntax = syntax;
+               syntax = ARISYNTAX;
+               USTPUTC(CTLARI, out);
+               if (dblquote)
+                       USTPUTC('"', out);
+               else
+                       USTPUTC(' ', out);
+       } else {
+               /*
+                * we collapse embedded arithmetic expansion to
+                * parenthesis, which should be equivalent
+                */
+               USTPUTC('(', out);
+       }
+       goto parsearith_return;
 }
+#endif
 
-
-/*      redir.c      */
+} /* end of readtoken */
 
 /*
- * Code for dealing with input/output redirection.
+ * Read the next input token.
+ * If the token is a word, we set backquotelist to the list of cmds in
+ *      backquotes.  We set quoteflag to true if any part of the word was
+ *      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
+ *  word parsing code into a separate routine.  In this case, readtoken
+ *  doesn't need to have any internal procedures, but parseword does.
+ *  We could also make parseoperator in essence the main routine, and
+ *  have parseword (readtoken1?) handle both words and redirection.]
  */
+#define NEW_xxreadtoken
+#ifdef NEW_xxreadtoken
+/* singles must be first! */
+static const char xxreadtoken_chars[7] ALIGN1 = {
+       '\n', '(', ')', '&', '|', ';', 0
+};
 
-#define EMPTY -2                /* marks an unused slot in redirtab */
-#ifndef PIPE_BUF
-# define PIPESIZE 4096          /* amount of buffering in a pipe */
-#else
-# define PIPESIZE PIPE_BUF
-#endif
+static const char xxreadtoken_tokens[] ALIGN1 = {
+       TNL, TLP, TRP,          /* only single occurrence allowed */
+       TBACKGND, TPIPE, TSEMI, /* if single occurrence */
+       TEOF,                   /* corresponds to trailing nul */
+       TAND, TOR, TENDCASE     /* if double occurrence */
+};
+
+#define xxreadtoken_doubles \
+       (sizeof(xxreadtoken_tokens) - sizeof(xxreadtoken_chars))
+#define xxreadtoken_singles \
+       (sizeof(xxreadtoken_chars) - xxreadtoken_doubles - 1)
 
-/*
- * Open a file in noclobber mode.
- * The code was copied from bash.
- */
 static int
-noclobberopen(const char *fname)
+xxreadtoken(void)
 {
-       int r, fd;
-       struct stat finfo, finfo2;
+       int c;
 
-       /*
-        * If the file exists and is a regular file, return an error
-        * immediately.
-        */
-       r = stat(fname, &finfo);
-       if (r == 0 && S_ISREG(finfo.st_mode)) {
-               errno = EEXIST;
-               return -1;
+       if (tokpushback) {
+               tokpushback = 0;
+               return lasttoken;
        }
+       if (needprompt) {
+               setprompt(2);
+       }
+       startlinno = plinno;
+       for (;;) {                      /* until token or start of word found */
+               c = pgetc_macro();
 
-       /*
-        * If the file was not present (r != 0), make sure we open it
-        * exclusively so that if it is created before we open it, our open
-        * will fail.  Make sure that we do not truncate an existing file.
-        * Note that we don't turn on O_EXCL unless the stat failed -- if the
-        * file was not a regular file, we leave O_EXCL off.
-        */
-       if (r != 0)
-               return open(fname, O_WRONLY|O_CREAT|O_EXCL, 0666);
-       fd = open(fname, O_WRONLY|O_CREAT, 0666);
-
-       /* If the open failed, return the file descriptor right away. */
-       if (fd < 0)
-               return fd;
+               if ((c != ' ') && (c != '\t')
+#if ENABLE_ASH_ALIAS
+                && (c != PEOA)
+#endif
+               ) {
+                       if (c == '#') {
+                               while ((c = pgetc()) != '\n' && c != PEOF);
+                               pungetc();
+                       } else if (c == '\\') {
+                               if (pgetc() != '\n') {
+                                       pungetc();
+                                       goto READTOKEN1;
+                               }
+                               startlinno = ++plinno;
+                               if (doprompt)
+                                       setprompt(2);
+                       } else {
+                               const char *p
+                                       = xxreadtoken_chars + sizeof(xxreadtoken_chars) - 1;
 
-       /*
-        * OK, the open succeeded, but the file may have been changed from a
-        * non-regular file to a regular file between the stat and the open.
-        * We are assuming that the O_EXCL open handles the case where FILENAME
-        * did not exist and is symlinked to an existing file between the stat
-        * and open.
-        */
+                               if (c != PEOF) {
+                                       if (c == '\n') {
+                                               plinno++;
+                                               needprompt = doprompt;
+                                       }
 
-       /*
-        * If we can open it and fstat the file descriptor, and neither check
-        * revealed that it was a regular file, and the file has not been
-        * replaced, return the file descriptor.
-        */
-       if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode)
-        && finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
-               return fd;
+                                       p = strchr(xxreadtoken_chars, c);
+                                       if (p == NULL) {
+ READTOKEN1:
+                                               return readtoken1(c, BASESYNTAX, (char *) NULL, 0);
+                                       }
 
-       /* The file has been replaced.  badness. */
-       close(fd);
-       errno = EEXIST;
-       return -1;
+                                       if (p - xxreadtoken_chars >= xxreadtoken_singles) {
+                                               if (pgetc() == *p) {    /* double occurrence? */
+                                                       p += xxreadtoken_doubles + 1;
+                                               } else {
+                                                       pungetc();
+                                               }
+                                       }
+                               }
+                               return lasttoken = xxreadtoken_tokens[p - xxreadtoken_chars];
+                       }
+               }
+       } /* for */
 }
-
-
-/*
- * Handle here documents.  Normally we fork off a process to write the
- * data to a pipe.  If the document is short, we can stuff the data in
- * the pipe without forking.
- */
+#else
+#define RETURN(token)   return lasttoken = token
 static int
-openhere(union node *redir)
+xxreadtoken(void)
 {
-       int pip[2];
-       size_t len = 0;
+       int c;
 
-       if (pipe(pip) < 0)
-               ash_msg_and_raise_error("Pipe call failed");
-       if (redir->type == NHERE) {
-               len = strlen(redir->nhere.doc->narg.text);
-               if (len <= PIPESIZE) {
-                       full_write(pip[1], redir->nhere.doc->narg.text, len);
-                       goto out;
-               }
+       if (tokpushback) {
+               tokpushback = 0;
+               return lasttoken;
        }
-       if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
-               close(pip[0]);
-               signal(SIGINT, SIG_IGN);
-               signal(SIGQUIT, SIG_IGN);
-               signal(SIGHUP, SIG_IGN);
-#ifdef SIGTSTP
-               signal(SIGTSTP, SIG_IGN);
-#endif
-               signal(SIGPIPE, SIG_DFL);
-               if (redir->type == NHERE)
-                       full_write(pip[1], redir->nhere.doc->narg.text, len);
-               else
-                       expandhere(redir->nhere.doc, pip[1]);
-               _exit(0);
+       if (needprompt) {
+               setprompt(2);
        }
- out:
-       close(pip[1]);
-       return pip[0];
-}
-
-static int
-openredirect(union node *redir)
-{
-       char *fname;
-       int f;
-
-       switch (redir->nfile.type) {
-       case NFROM:
-               fname = redir->nfile.expfname;
-               f = open(fname, O_RDONLY);
-               if (f < 0)
-                       goto eopen;
-               break;
-       case NFROMTO:
-               fname = redir->nfile.expfname;
-               f = open(fname, O_RDWR|O_CREAT|O_TRUNC, 0666);
-               if (f < 0)
-                       goto ecreate;
-               break;
-       case NTO:
-               /* Take care of noclobber mode. */
-               if (Cflag) {
-                       fname = redir->nfile.expfname;
-                       f = noclobberopen(fname);
-                       if (f < 0)
-                               goto ecreate;
-                       break;
+       startlinno = plinno;
+       for (;;) {      /* until token or start of word found */
+               c = pgetc_macro();
+               switch (c) {
+               case ' ': case '\t':
+#if ENABLE_ASH_ALIAS
+               case PEOA:
+#endif
+                       continue;
+               case '#':
+                       while ((c = pgetc()) != '\n' && c != PEOF);
+                       pungetc();
+                       continue;
+               case '\\':
+                       if (pgetc() == '\n') {
+                               startlinno = ++plinno;
+                               if (doprompt)
+                                       setprompt(2);
+                               continue;
+                       }
+                       pungetc();
+                       goto breakloop;
+               case '\n':
+                       plinno++;
+                       needprompt = doprompt;
+                       RETURN(TNL);
+               case PEOF:
+                       RETURN(TEOF);
+               case '&':
+                       if (pgetc() == '&')
+                               RETURN(TAND);
+                       pungetc();
+                       RETURN(TBACKGND);
+               case '|':
+                       if (pgetc() == '|')
+                               RETURN(TOR);
+                       pungetc();
+                       RETURN(TPIPE);
+               case ';':
+                       if (pgetc() == ';')
+                               RETURN(TENDCASE);
+                       pungetc();
+                       RETURN(TSEMI);
+               case '(':
+                       RETURN(TLP);
+               case ')':
+                       RETURN(TRP);
+               default:
+                       goto breakloop;
                }
-               /* FALLTHROUGH */
-       case NCLOBBER:
-               fname = redir->nfile.expfname;
-               f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-               if (f < 0)
-                       goto ecreate;
-               break;
-       case NAPPEND:
-               fname = redir->nfile.expfname;
-               f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666);
-               if (f < 0)
-                       goto ecreate;
-               break;
-       default:
-#if DEBUG
-               abort();
-#endif
-               /* Fall through to eliminate warning. */
-       case NTOFD:
-       case NFROMFD:
-               f = -1;
-               break;
-       case NHERE:
-       case NXHERE:
-               f = openhere(redir);
-               break;
        }
-
-       return f;
- ecreate:
-       ash_msg_and_raise_error("cannot create %s: %s", fname, errmsg(errno, "Directory nonexistent"));
- eopen:
-       ash_msg_and_raise_error("cannot open %s: %s", fname, errmsg(errno, "No such file"));
+ breakloop:
+       return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
+#undef RETURN
 }
+#endif /* NEW_xxreadtoken */
 
-static void
-dupredirect(union node *redir, int f)
+static int
+readtoken(void)
 {
-       int fd = redir->nfile.fd;
+       int t;
+#if DEBUG
+       smallint alreadyseen = tokpushback;
+#endif
 
-       if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
-               if (redir->ndup.dupfd >= 0) {   /* if not ">&-" */
-                       copyfd(redir->ndup.dupfd, fd);
+#if ENABLE_ASH_ALIAS
+ top:
+#endif
+
+       t = xxreadtoken();
+
+       /*
+        * eat newlines
+        */
+       if (checkkwd & CHKNL) {
+               while (t == TNL) {
+                       parseheredoc();
+                       t = xxreadtoken();
                }
-               return;
        }
 
-       if (f != fd) {
-               copyfd(f, fd);
-               close(f);
+       if (t != TWORD || quoteflag) {
+               goto out;
        }
-}
 
+       /*
+        * check for keywords
+        */
+       if (checkkwd & CHKKWD) {
+               const char *const *pp;
 
-/*
- * Process a list of redirection commands.  If the REDIR_PUSH flag is set,
- * old file descriptors are stashed away so that the redirection can be
- * undone by calling popredir.  If the REDIR_BACKQ flag is set, then the
- * standard output, and the standard error if it becomes a duplicate of
- * stdout, is saved in memory.
- */
-static void
-redirect(union node *redir, int flags)
-{
-       union node *n;
-       struct redirtab *sv;
-       int i;
-       int fd;
-       int newfd;
-       int *p;
-       nullredirs++;
-       if (!redir) {
-               return;
-       }
-       sv = NULL;
-       INT_OFF;
-       if (flags & REDIR_PUSH) {
-               struct redirtab *q;
-               q = ckmalloc(sizeof(struct redirtab));
-               q->next = redirlist;
-               redirlist = q;
-               q->nullredirs = nullredirs - 1;
-               for (i = 0; i < 10; i++)
-                       q->renamed[i] = EMPTY;
-               nullredirs = 0;
-               sv = q;
+               pp = findkwd(wordtext);
+               if (pp) {
+                       lasttoken = t = pp - tokname_array;
+                       TRACE(("keyword %s recognized\n", tokname(t)));
+                       goto out;
+               }
        }
-       n = redir;
-       do {
-               fd = n->nfile.fd;
-               if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD)
-                && n->ndup.dupfd == fd)
-                       continue; /* redirect from/to same file descriptor */
-
-               newfd = openredirect(n);
-               if (fd == newfd)
-                       continue;
-               if (sv && *(p = &sv->renamed[fd]) == EMPTY) {
-                       i = fcntl(fd, F_DUPFD, 10);
 
-                       if (i == -1) {
-                               i = errno;
-                               if (i != EBADF) {
-                                       close(newfd);
-                                       errno = i;
-                                       ash_msg_and_raise_error("%d: %m", fd);
-                                       /* NOTREACHED */
-                               }
-                       } else {
-                               *p = i;
-                               close(fd);
+       if (checkkwd & CHKALIAS) {
+#if ENABLE_ASH_ALIAS
+               struct alias *ap;
+               ap = lookupalias(wordtext, 1);
+               if (ap != NULL) {
+                       if (*ap->val) {
+                               pushstring(ap->val, ap);
                        }
-               } else {
-                       close(fd);
+                       goto top;
                }
-               dupredirect(n, newfd);
-       } while ((n = n->nfile.next));
-       INT_ON;
-       if (flags & REDIR_SAVEFD2 && sv && sv->renamed[2] >= 0)
-               preverrout_fd = sv->renamed[2];
+#endif
+       }
+ out:
+       checkkwd = 0;
+#if DEBUG
+       if (!alreadyseen)
+               TRACE(("token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
+       else
+               TRACE(("reread token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
+#endif
+       return t;
 }
 
-
-/*
- * Undo the effects of the last redirection.
- */
-static void
-popredir(int drop)
+static char
+peektoken(void)
 {
-       struct redirtab *rp;
-       int i;
+       int t;
 
-       if (--nullredirs >= 0)
-               return;
-       INT_OFF;
-       rp = redirlist;
-       for (i = 0; i < 10; i++) {
-               if (rp->renamed[i] != EMPTY) {
-                       if (!drop) {
-                               close(i);
-                               copyfd(rp->renamed[i], i);
-                       }
-                       close(rp->renamed[i]);
-               }
-       }
-       redirlist = rp->next;
-       nullredirs = rp->nullredirs;
-       free(rp);
-       INT_ON;
+       t = readtoken();
+       tokpushback = 1;
+       return tokname_array[t][0];
 }
 
 /*
- * Undo all redirections.  Called on error or interrupt.
+ * Read and parse a command.  Returns NEOF on end of file.  (NULL is a
+ * valid parse tree indicating a blank line.)
  */
+static union node *
+parsecmd(int interact)
+{
+       int t;
+
+       tokpushback = 0;
+       doprompt = interact;
+       if (doprompt)
+               setprompt(doprompt);
+       needprompt = 0;
+       t = readtoken();
+       if (t == TEOF)
+               return NEOF;
+       if (t == TNL)
+               return NULL;
+       tokpushback = 1;
+       return list(1);
+}
 
 /*
- * Discard all saved file descriptors.
+ * Input any here documents.
  */
 static void
-clearredir(int drop)
+parseheredoc(void)
 {
-       for (;;) {
-               nullredirs = 0;
-               if (!redirlist)
-                       break;
-               popredir(drop);
+       struct heredoc *here;
+       union node *n;
+
+       here = heredoclist;
+       heredoclist = 0;
+
+       while (here) {
+               if (needprompt) {
+                       setprompt(2);
+               }
+               readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX,
+                               here->eofmark, here->striptabs);
+               n = stalloc(sizeof(struct narg));
+               n->narg.type = NARG;
+               n->narg.next = NULL;
+               n->narg.text = wordtext;
+               n->narg.backquote = backquotelist;
+               here->here->nhere.doc = n;
+               here = here->next;
        }
 }
 
 
 /*
- * Copy a file descriptor to be >= to.  Returns -1
- * if the source file descriptor is closed, EMPTY if there are no unused
- * file descriptors left.
+ * called by editline -- any expansions to the prompt should be added here.
  */
-static int
-copyfd(int from, int to)
+#if ENABLE_ASH_EXPAND_PRMT
+static const char *
+expandstr(const char *ps)
 {
-       int newfd;
+       union node n;
 
-       newfd = fcntl(from, F_DUPFD, to);
-       if (newfd < 0) {
-               if (errno == EMFILE)
-                       return EMPTY;
-               ash_msg_and_raise_error("%d: %m", from);
-       }
-       return newfd;
+       /* XXX Fix (char *) cast. */
+       setinputstring((char *)ps);
+       readtoken1(pgetc(), PSSYNTAX, nullstr, 0);
+       popfile();
+
+       n.narg.type = NARG;
+       n.narg.next = NULL;
+       n.narg.text = wordtext;
+       n.narg.backquote = backquotelist;
+
+       expandarg(&n, NULL, 0);
+       return stackblock();
 }
+#endif
 
+/*
+ * Execute a command or commands contained in a string.
+ */
 static int
-redirectsafe(union node *redir, int flags)
+evalstring(char *s, int mask)
 {
-       int err;
-       volatile int saveint;
-       struct jmploc *volatile savehandler = exception_handler;
-       struct jmploc jmploc;
+       union node *n;
+       struct stackmark smark;
+       int skip;
 
-       SAVE_INT(saveint);
-       err = setjmp(jmploc.loc) * 2;
-       if (!err) {
-               exception_handler = &jmploc;
-               redirect(redir, flags);
-       }
-       exception_handler = savehandler;
-       if (err && exception != EXERROR)
-               longjmp(exception_handler->loc, 1);
-       RESTORE_INT(saveint);
-       return err;
-}
+       setinputstring(s);
+       setstackmark(&smark);
 
+       skip = 0;
+       while ((n = parsecmd(0)) != NEOF) {
+               evaltree(n, 0);
+               popstackmark(&smark);
+               skip = evalskip;
+               if (skip)
+                       break;
+       }
+       popfile();
 
-/*      trap.c       */
+       skip &= mask;
+       evalskip = skip;
+       return skip;
+}
 
 /*
- * Sigmode records the current value of the signal handlers for the various
- * modes.  A value of zero means that the current handler is not known.
- * S_HARD_IGN indicates that the signal was ignored on entry to the shell,
+ * The eval command.
  */
+static int
+evalcmd(int argc, char **argv)
+{
+       char *p;
+       char *concat;
+       char **ap;
 
-#define S_DFL 1                 /* default signal handling (SIG_DFL) */
-#define S_CATCH 2               /* signal is caught */
-#define S_IGN 3                 /* signal is ignored (SIG_IGN) */
-#define S_HARD_IGN 4            /* signal is ignored permenantly */
-#define S_RESET 5               /* temporary - to reset a hard ignored sig */
+       if (argc > 1) {
+               p = argv[1];
+               if (argc > 2) {
+                       STARTSTACKSTR(concat);
+                       ap = argv + 2;
+                       for (;;) {
+                               concat = stack_putstr(p, concat);
+                               p = *ap++;
+                               if (p == NULL)
+                                       break;
+                               STPUTC(' ', concat);
+                       }
+                       STPUTC('\0', concat);
+                       p = grabstackstr(concat);
+               }
+               evalstring(p, ~SKIPEVAL);
 
+       }
+       return exitstatus;
+}
 
 /*
- * The trap builtin.
+ * Read and execute commands.  "Top" is nonzero for the top level command
+ * loop; it turns on prompting if the shell is interactive.
  */
 static int
-trapcmd(int argc, char **argv)
+cmdloop(int top)
 {
-       char *action;
-       char **ap;
-       int signo;
+       union node *n;
+       struct stackmark smark;
+       int inter;
+       int numeof = 0;
 
-       nextopt(nullstr);
-       ap = argptr;
-       if (!*ap) {
-               for (signo = 0; signo < NSIG; signo++) {
-                       if (trap[signo] != NULL) {
-                               const char *sn;
+       TRACE(("cmdloop(%d) called\n", top));
+       for (;;) {
+               int skip;
 
-                               sn = get_signame(signo);
-                               out1fmt("trap -- %s %s\n",
-                                       single_quote(trap[signo]), sn);
+               setstackmark(&smark);
+#if JOBS
+               if (jobctl)
+                       showjobs(stderr, SHOW_CHANGED);
+#endif
+               inter = 0;
+               if (iflag && top) {
+                       inter++;
+#if ENABLE_ASH_MAIL
+                       chkmail();
+#endif
+               }
+               n = parsecmd(inter);
+               /* showtree(n); DEBUG */
+               if (n == NEOF) {
+                       if (!top || numeof >= 50)
+                               break;
+                       if (!stoppedjobs()) {
+                               if (!Iflag)
+                                       break;
+                               out2str("\nUse \"exit\" to leave shell.\n");
                        }
+                       numeof++;
+               } else if (nflag == 0) {
+                       /* job_warning can only be 2,1,0. Here 2->1, 1/0->0 */
+                       job_warning >>= 1;
+                       numeof = 0;
+                       evaltree(n, 0);
                }
-               return 0;
-       }
-       if (!ap[1])
-               action = NULL;
-       else
-               action = *ap++;
-       while (*ap) {
-               signo = get_signum(*ap);
-               if (signo < 0)
-                       ash_msg_and_raise_error("%s: bad trap", *ap);
-               INT_OFF;
-               if (action) {
-                       if (LONE_DASH(action))
-                               action = NULL;
-                       else
-                               action = ckstrdup(action);
+               popstackmark(&smark);
+               skip = evalskip;
+
+               if (skip) {
+                       evalskip = 0;
+                       return skip & SKIPEVAL;
                }
-               if (trap[signo])
-                       free(trap[signo]);
-               trap[signo] = action;
-               if (signo != 0)
-                       setsignal(signo);
-               INT_ON;
-               ap++;
        }
        return 0;
 }
 
-
 /*
- * Clear traps on a fork.
+ * Take commands from a file.  To be compatible we should do a path
+ * search for the file, which is necessary to find sub-commands.
  */
-static void
-clear_traps(void)
+static char *
+find_dot_file(char *name)
 {
-       char **tp;
+       char *fullname;
+       const char *path = pathval();
+       struct stat statb;
 
-       for (tp = trap; tp < &trap[NSIG]; tp++) {
-               if (*tp && **tp) {      /* trap not NULL or SIG_IGN */
-                       INT_OFF;
-                       free(*tp);
-                       *tp = NULL;
-                       if (tp != &trap[0])
-                               setsignal(tp - trap);
-                       INT_ON;
+       /* don't try this for absolute or relative paths */
+       if (strchr(name, '/'))
+               return name;
+
+       while ((fullname = padvance(&path, name)) != NULL) {
+               if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
+                       /*
+                        * Don't bother freeing here, since it will
+                        * be freed by the caller.
+                        */
+                       return fullname;
                }
+               stunalloc(fullname);
        }
-}
 
+       /* not found in the PATH */
+       ash_msg_and_raise_error("%s: not found", name);
+       /* NOTREACHED */
+}
 
-/*
- * Set the signal handler for the specified signal.  The routine figures
- * out what it should be set to.
- */
-static void
-setsignal(int signo)
+static int
+dotcmd(int argc, char **argv)
 {
-       int action;
-       char *t, tsig;
-       struct sigaction act;
+       struct strlist *sp;
+       volatile struct shparam saveparam;
+       int status = 0;
 
-       t = trap[signo];
-       if (t == NULL)
-               action = S_DFL;
-       else if (*t != '\0')
-               action = S_CATCH;
-       else
-               action = S_IGN;
-       if (rootshell && action == S_DFL) {
-               switch (signo) {
-               case SIGINT:
-                       if (iflag || minusc || sflag == 0)
-                               action = S_CATCH;
-                       break;
-               case SIGQUIT:
-#if DEBUG
-                       if (debug)
-                               break;
-#endif
-                       /* FALLTHROUGH */
-               case SIGTERM:
-                       if (iflag)
-                               action = S_IGN;
-                       break;
-#if JOBS
-               case SIGTSTP:
-               case SIGTTOU:
-                       if (mflag)
-                               action = S_IGN;
-                       break;
-#endif
-               }
-       }
+       for (sp = cmdenviron; sp; sp = sp->next)
+               setvareq(ckstrdup(sp->text), VSTRFIXED | VTEXTFIXED);
+
+       if (argc >= 2) {        /* That's what SVR2 does */
+               char *fullname;
+
+               fullname = find_dot_file(argv[1]);
+
+               if (argc > 2) {
+                       saveparam = shellparam;
+                       shellparam.malloc = 0;
+                       shellparam.nparam = argc - 2;
+                       shellparam.p = argv + 2;
+               };
+
+               setinputfile(fullname, INPUT_PUSH_FILE);
+               commandname = fullname;
+               cmdloop(0);
+               popfile();
 
-       t = &sigmode[signo - 1];
-       tsig = *t;
-       if (tsig == 0) {
-               /*
-                * current setting unknown
-                */
-               if (sigaction(signo, 0, &act) == -1) {
-                       /*
-                        * Pretend it worked; maybe we should give a warning
-                        * here, but other shells don't. We don't alter
-                        * sigmode, so that we retry every time.
-                        */
-                       return;
-               }
-               if (act.sa_handler == SIG_IGN) {
-                       if (mflag
-                        && (signo == SIGTSTP || signo == SIGTTIN || signo == SIGTTOU)
-                       ) {
-                               tsig = S_IGN;   /* don't hard ignore these */
-                       } else
-                               tsig = S_HARD_IGN;
-               } else {
-                       tsig = S_RESET; /* force to be set */
-               }
-       }
-       if (tsig == S_HARD_IGN || tsig == action)
-               return;
-       switch (action) {
-       case S_CATCH:
-               act.sa_handler = onsig;
-               break;
-       case S_IGN:
-               act.sa_handler = SIG_IGN;
-               break;
-       default:
-               act.sa_handler = SIG_DFL;
+               if (argc > 2) {
+                       freeparam(&shellparam);
+                       shellparam = saveparam;
+               };
+               status = exitstatus;
        }
-       *t = action;
-       act.sa_flags = 0;
-       sigfillset(&act.sa_mask);
-       sigaction(signo, &act, 0);
+       return status;
+}
+
+static int
+exitcmd(int argc, char **argv)
+{
+       if (stoppedjobs())
+               return 0;
+       if (argc > 1)
+               exitstatus = number(argv[1]);
+       raise_exception(EXEXIT);
+       /* NOTREACHED */
+}
+
+#if ENABLE_ASH_BUILTIN_ECHO
+static int
+echocmd(int argc, char **argv)
+{
+       return bb_echo(argv);
 }
+#endif
 
+#if ENABLE_ASH_BUILTIN_TEST
+static int
+testcmd(int argc, char **argv)
+{
+       return test_main(argc, argv);
+}
+#endif
 
 /*
- * Ignore a signal.
+ * Read a file containing shell functions.
  */
 static void
-ignoresig(int signo)
+readcmdfile(char *name)
 {
-       if (sigmode[signo - 1] != S_IGN && sigmode[signo - 1] != S_HARD_IGN) {
-               signal(signo, SIG_IGN);
-       }
-       sigmode[signo - 1] = S_HARD_IGN;
+       setinputfile(name, INPUT_PUSH_FILE);
+       cmdloop(0);
+       popfile();
 }
 
 
+/* ============ find_command inplementation */
+
 /*
- * Signal handler.
+ * Resolve a command name.  If you change this routine, you may have to
+ * change the shellexec routine as well.
  */
 static void
-onsig(int signo)
+find_command(char *name, struct cmdentry *entry, int act, const char *path)
 {
-       gotsig[signo - 1] = 1;
-       pendingsigs = signo;
+       struct tblentry *cmdp;
+       int idx;
+       int prev;
+       char *fullname;
+       struct stat statb;
+       int e;
+       int updatetbl;
+       struct builtincmd *bcmd;
 
-       if (exsig || (signo == SIGINT && !trap[SIGINT])) {
-               if (!suppressint)
-                       raise_interrupt();
-               intpending = 1;
+       /* If name contains a slash, don't use PATH or hash table */
+       if (strchr(name, '/') != NULL) {
+               entry->u.index = -1;
+               if (act & DO_ABS) {
+                       while (stat(name, &statb) < 0) {
+#ifdef SYSV
+                               if (errno == EINTR)
+                                       continue;
+#endif
+                               entry->cmdtype = CMDUNKNOWN;
+                               return;
+                       }
+               }
+               entry->cmdtype = CMDNORMAL;
+               return;
        }
-}
 
+/* #if ENABLE_FEATURE_SH_STANDALONE... moved after builtin check */
 
-/*
- * Called to execute a trap.  Perhaps we should avoid entering new trap
- * handlers while we are executing a trap handler.
- */
-static int
-dotrap(void)
-{
-       char *p;
-       char *q;
-       int i;
-       int savestatus;
-       int skip = 0;
+       updatetbl = (path == pathval());
+       if (!updatetbl) {
+               act |= DO_ALTPATH;
+               if (strstr(path, "%builtin") != NULL)
+                       act |= DO_ALTBLTIN;
+       }
 
-       savestatus = exitstatus;
-       pendingsigs = 0;
-       xbarrier();
+       /* If name is in the table, check answer will be ok */
+       cmdp = cmdlookup(name, 0);
+       if (cmdp != NULL) {
+               int bit;
 
-       for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) {
-               if (!*q)
-                       continue;
-               *q = '\0';
+               switch (cmdp->cmdtype) {
+               default:
+#if DEBUG
+                       abort();
+#endif
+               case CMDNORMAL:
+                       bit = DO_ALTPATH;
+                       break;
+               case CMDFUNCTION:
+                       bit = DO_NOFUNC;
+                       break;
+               case CMDBUILTIN:
+                       bit = DO_ALTBLTIN;
+                       break;
+               }
+               if (act & bit) {
+                       updatetbl = 0;
+                       cmdp = NULL;
+               } else if (cmdp->rehash == 0)
+                       /* if not invalidated by cd, we're done */
+                       goto success;
+       }
 
-               p = trap[i + 1];
-               if (!p)
+       /* If %builtin not in path, check for builtin next */
+       bcmd = find_builtin(name);
+       if (bcmd) {
+               if (IS_BUILTIN_REGULAR(bcmd))
+                       goto builtin_success;
+               if (act & DO_ALTPATH) {
+                       if (!(act & DO_ALTBLTIN))
+                               goto builtin_success;
+               } else if (builtinloc <= 0) {
+                       goto builtin_success;
+               }
+       }
+
+#if ENABLE_FEATURE_SH_STANDALONE
+       if (find_applet_by_name(name)) {
+               entry->cmdtype = CMDNORMAL;
+               entry->u.index = -1;
+               return;
+       }
+#endif
+
+       /* We have to search path. */
+       prev = -1;              /* where to start */
+       if (cmdp && cmdp->rehash) {     /* doing a rehash */
+               if (cmdp->cmdtype == CMDBUILTIN)
+                       prev = builtinloc;
+               else
+                       prev = cmdp->param.index;
+       }
+
+       e = ENOENT;
+       idx = -1;
+ loop:
+       while ((fullname = padvance(&path, name)) != NULL) {
+               stunalloc(fullname);
+               /* NB: code below will still use fullname
+                * despite it being "unallocated" */
+               idx++;
+               if (pathopt) {
+                       if (prefix(pathopt, "builtin")) {
+                               if (bcmd)
+                                       goto builtin_success;
+                               continue;
+                       } else if (!(act & DO_NOFUNC)
+                        && prefix(pathopt, "func")) {
+                               /* handled below */
+                       } else {
+                               /* ignore unimplemented options */
+                               continue;
+                       }
+               }
+               /* if rehash, don't redo absolute path names */
+               if (fullname[0] == '/' && idx <= prev) {
+                       if (idx < prev)
+                               continue;
+                       TRACE(("searchexec \"%s\": no change\n", name));
+                       goto success;
+               }
+               while (stat(fullname, &statb) < 0) {
+#ifdef SYSV
+                       if (errno == EINTR)
+                               continue;
+#endif
+                       if (errno != ENOENT && errno != ENOTDIR)
+                               e = errno;
+                       goto loop;
+               }
+               e = EACCES;     /* if we fail, this will be the error */
+               if (!S_ISREG(statb.st_mode))
                        continue;
-               skip = evalstring(p, SKIPEVAL);
-               exitstatus = savestatus;
-               if (skip)
-                       break;
+               if (pathopt) {          /* this is a %func directory */
+                       stalloc(strlen(fullname) + 1);
+                       /* NB: stalloc will return space pointed by fullname
+                        * (because we don't have any intervening allocations
+                        * between stunalloc above and this stalloc) */
+                       readcmdfile(fullname);
+                       cmdp = cmdlookup(name, 0);
+                       if (cmdp == NULL || cmdp->cmdtype != CMDFUNCTION)
+                               ash_msg_and_raise_error("%s not defined in %s", name, fullname);
+                       stunalloc(fullname);
+                       goto success;
+               }
+               TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
+               if (!updatetbl) {
+                       entry->cmdtype = CMDNORMAL;
+                       entry->u.index = idx;
+                       return;
+               }
+               INT_OFF;
+               cmdp = cmdlookup(name, 1);
+               cmdp->cmdtype = CMDNORMAL;
+               cmdp->param.index = idx;
+               INT_ON;
+               goto success;
        }
 
-       return skip;
+       /* We failed.  If there was an entry for this command, delete it */
+       if (cmdp && updatetbl)
+               delete_cmd_entry();
+       if (act & DO_ERR)
+               ash_msg("%s: %s", name, errmsg(e, "not found"));
+       entry->cmdtype = CMDUNKNOWN;
+       return;
+
+ builtin_success:
+       if (!updatetbl) {
+               entry->cmdtype = CMDBUILTIN;
+               entry->u.cmd = bcmd;
+               return;
+       }
+       INT_OFF;
+       cmdp = cmdlookup(name, 1);
+       cmdp->cmdtype = CMDBUILTIN;
+       cmdp->param.cmd = bcmd;
+       INT_ON;
+ success:
+       cmdp->rehash = 0;
+       entry->cmdtype = cmdp->cmdtype;
+       entry->u = cmdp->param;
 }
 
+
+/* ============ trap.c */
+
 /*
- * Controls whether the shell is interactive or not.
+ * The trap builtin.
  */
-static void
-setinteractive(int on)
+static int
+trapcmd(int argc, char **argv)
 {
-       static int is_interactive;
+       char *action;
+       char **ap;
+       int signo;
 
-       if (++on == is_interactive)
-               return;
-       is_interactive = on;
-       setsignal(SIGINT);
-       setsignal(SIGQUIT);
-       setsignal(SIGTERM);
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-       if (is_interactive > 1) {
-               /* Looks like they want an interactive shell */
-               static int do_banner;
+       nextopt(nullstr);
+       ap = argptr;
+       if (!*ap) {
+               for (signo = 0; signo < NSIG; signo++) {
+                       if (trap[signo] != NULL) {
+                               const char *sn;
 
-               if (!do_banner) {
-                       out1fmt(
-                               "\n\n"
-                               "%s Built-in shell (ash)\n"
-                               "Enter 'help' for a list of built-in commands."
-                               "\n\n",
-                               BB_BANNER);
-                       do_banner++;
+                               sn = get_signame(signo);
+                               out1fmt("trap -- %s %s\n",
+                                       single_quote(trap[signo]), sn);
+                       }
                }
+               return 0;
        }
-#endif
+       if (!ap[1])
+               action = NULL;
+       else
+               action = *ap++;
+       while (*ap) {
+               signo = get_signum(*ap);
+               if (signo < 0)
+                       ash_msg_and_raise_error("%s: bad trap", *ap);
+               INT_OFF;
+               if (action) {
+                       if (LONE_DASH(action))
+                               action = NULL;
+                       else
+                               action = ckstrdup(action);
+               }
+               free(trap[signo]);
+               trap[signo] = action;
+               if (signo != 0)
+                       setsignal(signo);
+               INT_ON;
+               ap++;
+       }
+       return 0;
 }
 
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-/*** List the available builtins ***/
 
+/* ============ Builtins */
+
+#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+/*
+ * Lists available builtins
+ */
 static int
 helpcmd(int argc, char **argv)
 {
        int col, i;
 
        out1fmt("\nBuilt-in commands:\n-------------------\n");
-       for (col = 0, i = 0; i < NUMBUILTINS; i++) {
+       for (col = 0, i = 0; i < ARRAY_SIZE(builtintab); i++) {
                col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '),
-                                         builtincmd[i].name + 1);
+                                       builtintab[i].name + 1);
                if (col > 60) {
                        out1fmt("\n");
                        col = 0;
                }
        }
-#if ENABLE_FEATURE_SH_STANDALONE_SHELL
+#if ENABLE_FEATURE_SH_STANDALONE
        for (i = 0; i < NUM_APPLETS; i++) {
                col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), applets[i].name);
                if (col > 60) {
@@ -11633,41 +11298,6 @@ helpcmd(int argc, char **argv)
 }
 #endif /* FEATURE_SH_EXTRA_QUIET */
 
-/*
- * Called to exit the shell.
- */
-static void
-exitshell(void)
-{
-       struct jmploc loc;
-       char *p;
-       int status;
-
-       status = exitstatus;
-       TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
-       if (setjmp(loc.loc)) {
-               if (exception == EXEXIT)
-/* dash bug: it just does _exit(exitstatus) here
- * but we have to do setjobctl(0) first!
- * (bug is still not fixed in dash-0.5.3 - if you run dash
- * under Midnight Commander, on exit from dash MC is backgrounded) */
-                       status = exitstatus;
-               goto out;
-       }
-       exception_handler = &loc;
-       p = trap[0];
-       if (p) {
-               trap[0] = NULL;
-               evalstring(p, 0);
-       }
-       flush_stdout_stderr();
- out:
-       setjobctl(0);
-       _exit(status);
-       /* NOTREACHED */
-}
-
-
 /*
  * The export and readonly commands.
  */
@@ -11704,70 +11334,19 @@ exportcmd(int argc, char **argv)
        return 0;
 }
 
-
-/*
- * Make a variable a local variable.  When a variable is made local, it's
- * value and flags are saved in a localvar structure.  The saved values
- * will be restored when the shell function returns.  We handle the name
- * "-" as a special case.
- */
-static void mklocal(char *name)
-{
-       struct localvar *lvp;
-       struct var **vpp;
-       struct var *vp;
-
-       INT_OFF;
-       lvp = ckmalloc(sizeof(struct localvar));
-       if (LONE_DASH(name)) {
-               char *p;
-               p = ckmalloc(sizeof(optlist));
-               lvp->text = memcpy(p, optlist, sizeof(optlist));
-               vp = NULL;
-       } else {
-               char *eq;
-
-               vpp = hashvar(name);
-               vp = *findvar(vpp, name);
-               eq = strchr(name, '=');
-               if (vp == NULL) {
-                       if (eq)
-                               setvareq(name, VSTRFIXED);
-                       else
-                               setvar(name, NULL, VSTRFIXED);
-                       vp = *vpp;      /* the new variable */
-                       lvp->flags = VUNSET;
-               } else {
-                       lvp->text = vp->text;
-                       lvp->flags = vp->flags;
-                       vp->flags |= VSTRFIXED|VTEXTFIXED;
-                       if (eq)
-                               setvareq(name, 0);
-               }
-       }
-       lvp->vp = vp;
-       lvp->next = localvars;
-       localvars = lvp;
-       INT_ON;
-}
-
-
 /*
- * The "local" command.
+ * Delete a function if it exists.
  */
-static int
-localcmd(int argc, char **argv)
+static void
+unsetfunc(const char *name)
 {
-       char *name;
+       struct tblentry *cmdp;
 
-       argv = argptr;
-       while ((name = *argv++) != NULL) {
-               mklocal(name);
-       }
-       return 0;
+       cmdp = cmdlookup(name, 0);
+       if (cmdp!= NULL && cmdp->cmdtype == CMDFUNCTION)
+               delete_cmd_entry();
 }
 
-
 /*
  * The unset builtin command.  We unset the function before we unset the
  * variable to allow a function to be unset when there is a readonly variable
@@ -11803,7 +11382,7 @@ unsetcmd(int argc, char **argv)
 
 #include <sys/times.h>
 
-static const unsigned char timescmd_str[] = {
+static const unsigned char timescmd_str[] ALIGN1 = {
        ' ',  offsetof(struct tms, tms_utime),
        '\n', offsetof(struct tms, tms_stime),
        ' ',  offsetof(struct tms, tms_cutime),
@@ -11811,9 +11390,10 @@ static const unsigned char timescmd_str[] = {
        0
 };
 
-static int timescmd(int ac, char **av)
+static int
+timescmd(int ac, char **av)
 {
-       long int clk_tck, s, t;
+       long clk_tck, s, t;
        const unsigned char *p;
        struct tms buf;
 
@@ -11845,19 +11425,17 @@ dash_arith(const char *s)
        if (errcode < 0) {
                if (errcode == -3)
                        ash_msg_and_raise_error("exponent less than 0");
-               else if (errcode == -2)
+               if (errcode == -2)
                        ash_msg_and_raise_error("divide by zero");
-               else if (errcode == -5)
+               if (errcode == -5)
                        ash_msg_and_raise_error("expression recursion loop detected");
-               else
-                       raise_error_syntax(s);
+               raise_error_syntax(s);
        }
        INT_ON;
 
        return result;
 }
 
-
 /*
  *  The let builtin. partial stolen from GNU Bash, the Bourne Again SHell.
  *  Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
@@ -11881,9 +11459,9 @@ letcmd(int argc, char **argv)
 }
 #endif /* ASH_MATH_SUPPORT */
 
-/*      miscbltin.c  */
 
-/*
+/* ============ miscbltin.c
+ *
  * Miscellaneous builtins.
  */
 
@@ -11893,7 +11471,6 @@ letcmd(int argc, char **argv)
 typedef enum __rlimit_resource rlim_t;
 #endif
 
-
 /*
  * The read builtin.  The -e option causes backslashes to escape the
  * following character.
@@ -12011,8 +11588,9 @@ readcmd(int argc, char **argv)
 #endif
 #if ENABLE_ASH_READ_TIMEOUT
        if (ts.tv_sec || ts.tv_usec) {
-               FD_ZERO (&set);
-               FD_SET (0, &set);
+// TODO: replace with poll, it is smaller
+               FD_ZERO(&set);
+               FD_SET(0, &set);
 
                i = select(FD_SETSIZE, &set, NULL, NULL, &ts);
                if (!i) {
@@ -12082,12 +11660,12 @@ readcmd(int argc, char **argv)
        return status;
 }
 
-
-static int umaskcmd(int argc, char **argv)
+static int
+umaskcmd(int argc, char **argv)
 {
-       static const char permuser[3] = "ugo";
-       static const char permmode[3] = "rwx";
-       static const short int permmask[] = {
+       static const char permuser[3] ALIGN1 = "ugo";
+       static const char permmode[3] ALIGN1 = "rwx";
+       static const short permmask[] ALIGN2 = {
                S_IRUSR, S_IWUSR, S_IXUSR,
                S_IRGRP, S_IWGRP, S_IXGRP,
                S_IROTH, S_IWOTH, S_IXOTH
@@ -12142,7 +11720,7 @@ static int umaskcmd(int argc, char **argv)
                } else {
                        mask = ~mask & 0777;
                        if (!bb_parse_mode(ap, &mask)) {
-                               ash_msg_and_raise_error("Illegal mode: %s", ap);
+                               ash_msg_and_raise_error("illegal mode: %s", ap);
                        }
                        umask(~mask & 0777);
                }
@@ -12201,12 +11779,13 @@ static const struct limits limits[] = {
 #ifdef RLIMIT_LOCKS
        { "locks",                      RLIMIT_LOCKS,      1, 'w' },
 #endif
-       { (char *) 0,                   0,                 0,  '\0' }
+       { NULL,                         0,                 0,  '\0' }
 };
 
 enum limtype { SOFT = 0x1, HARD = 0x2 };
 
-static void printlim(enum limtype how, const struct rlimit *limit,
+static void
+printlim(enum limtype how, const struct rlimit *limit,
                        const struct limits *l)
 {
        rlim_t val;
@@ -12223,16 +11802,16 @@ static void printlim(enum limtype how, const struct rlimit *limit,
        }
 }
 
-int
+static int
 ulimitcmd(int argc, char **argv)
 {
-       int     c;
+       int c;
        rlim_t val = 0;
        enum limtype how = SOFT | HARD;
-       const struct limits     *l;
-       int             set, all = 0;
-       int             optc, what;
-       struct rlimit   limit;
+       const struct limits *l;
+       int set, all = 0;
+       int optc, what;
+       struct rlimit limit;
 
        what = 'f';
        while ((optc = nextopt("HSa"
@@ -12332,6 +11911,8 @@ ulimitcmd(int argc, char **argv)
 }
 
 
+/* ============ Math support */
+
 #if ENABLE_ASH_MATH_SUPPORT
 
 /* Copyright (c) 2001 Aaron Lehmann <aaronl@vitelus.com>
@@ -12428,11 +12009,9 @@ ulimitcmd(int argc, char **argv)
  * - always use special isspace(), see comment from bash ;-)
  */
 
-
 #define arith_isspace(arithval) \
        (arithval == ' ' || arithval == '\n' || arithval == '\t')
 
-
 typedef unsigned char operator;
 
 /* An operator's token id is a bit of a bitfield. The lower 5 bits are the
@@ -12524,7 +12103,8 @@ typedef unsigned char operator;
 
 #define NUMPTR (*numstackptr)
 
-static int tok_have_assign(operator op)
+static int
+tok_have_assign(operator op)
 {
        operator prec = PREC(op);
 
@@ -12533,13 +12113,13 @@ static int tok_have_assign(operator op)
                        prec == PREC_PRE || prec == PREC_POST);
 }
 
-static int is_right_associativity(operator prec)
+static int
+is_right_associativity(operator prec)
 {
        return (prec == PREC(TOK_ASSIGN) || prec == PREC(TOK_EXPONENT)
                || prec == PREC(TOK_CONDITIONAL));
 }
 
-
 typedef struct ARITCH_VAR_NUM {
        arith_t val;
        arith_t contidional_second_val;
@@ -12548,7 +12128,6 @@ typedef struct ARITCH_VAR_NUM {
                           else is variable name */
 } v_n_t;
 
-
 typedef struct CHK_VAR_RECURSIVE_LOOPED {
        const char *var;
        struct CHK_VAR_RECURSIVE_LOOPED *next;
@@ -12556,8 +12135,8 @@ typedef struct CHK_VAR_RECURSIVE_LOOPED {
 
 static chk_var_recursive_looped_t *prev_chk_var_recursive;
 
-
-static int arith_lookup_val(v_n_t *t)
+static int
+arith_lookup_val(v_n_t *t)
 {
        if (t->var) {
                const char * p = lookupvar(t->var);
@@ -12595,7 +12174,8 @@ static int arith_lookup_val(v_n_t *t)
 /* "applying" a token means performing it on the top elements on the integer
  * stack. For a unary operator it will only change the top element, but a
  * binary operator will pop two arguments and push a result */
-static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
+static int
+arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
 {
        v_n_t *numptr_m1;
        arith_t numptr_val, rez;
@@ -12692,12 +12272,10 @@ static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
                        }
                        numptr_m1->contidional_second_val_initialized = op;
                        numptr_m1->contidional_second_val = numptr_val;
-               }
-               else if (op == TOK_CONDITIONAL) {
+               } else if (op == TOK_CONDITIONAL) {
                        rez = rez ?
                                numptr_val : numptr_m1->contidional_second_val;
-               }
-               else if (op == TOK_EXPONENT) {
+               } else if (op == TOK_EXPONENT) {
                        if (numptr_val < 0)
                                return -3;      /* exponent less than 0 */
                        else {
@@ -12708,8 +12286,7 @@ static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
                                                c *= rez;
                                rez = c;
                        }
-               }
-               else if (numptr_val==0)          /* zero divisor check */
+               } else if (numptr_val==0)          /* zero divisor check */
                        return -2;
                else if (op == TOK_DIV || op == TOK_DIV_ASSIGN)
                        rez /= numptr_val;
@@ -12717,7 +12294,7 @@ static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
                        rez %= numptr_val;
        }
        if (tok_have_assign(op)) {
-               char buf[32];
+               char buf[sizeof(arith_t_type)*3 + 2];
 
                if (numptr_m1->var == NULL) {
                        /* Hmm, 1=2 ? */
@@ -12725,9 +12302,9 @@ static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
                }
                /* save to shell variable */
 #if ENABLE_ASH_MATH_SUPPORT_64
-               snprintf(buf, sizeof(buf), "%lld", arith_t_type rez);
+               snprintf(buf, sizeof(buf), "%lld", (arith_t_type) rez);
 #else
-               snprintf(buf, sizeof(buf), "%ld", arith_t_type rez);
+               snprintf(buf, sizeof(buf), "%ld", (arith_t_type) rez);
 #endif
                setvar(numptr_m1->var, buf, 0);
                /* after saving, make previous value for v++ or v-- */
@@ -12744,8 +12321,8 @@ static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
        return -1;
 }
 
-/* longest must first */
-static const char op_tokens[] = {
+/* longest must be first */
+static const char op_tokens[] ALIGN1 = {
        '<','<','=',0, TOK_LSHIFT_ASSIGN,
        '>','>','=',0, TOK_RSHIFT_ASSIGN,
        '<','<',    0, TOK_LSHIFT,
@@ -12791,8 +12368,8 @@ static const char op_tokens[] = {
 /* ptr to ")" */
 #define endexpression &op_tokens[sizeof(op_tokens)-7]
 
-
-static arith_t arith(const char *expr, int *perrcode)
+static arith_t
+arith(const char *expr, int *perrcode)
 {
        char arithval; /* Current character under analysis */
        operator lasttok, op;
@@ -12982,16 +12559,45 @@ static arith_t arith(const char *expr, int *perrcode)
 #endif /* ASH_MATH_SUPPORT */
 
 
-/* ============ main() and helpers
- *
- * Main routine.  We initialize things, parse the arguments, execute
- * profiles if we're a login shell, and then call cmdloop to execute
- * commands.  The setjmp call sets up the location to jump to when an
- * exception occurs.  When an exception occurs the variable "state"
- * is used to figure out how far we had gotten.
+/* ============ main() and helpers */
+
+/*
+ * Called to exit the shell.
  */
+static void exitshell(void) ATTRIBUTE_NORETURN;
+static void
+exitshell(void)
+{
+       struct jmploc loc;
+       char *p;
+       int status;
+
+       status = exitstatus;
+       TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
+       if (setjmp(loc.loc)) {
+               if (exception == EXEXIT)
+/* dash bug: it just does _exit(exitstatus) here
+ * but we have to do setjobctl(0) first!
+ * (bug is still not fixed in dash-0.5.3 - if you run dash
+ * under Midnight Commander, on exit from dash MC is backgrounded) */
+                       status = exitstatus;
+               goto out;
+       }
+       exception_handler = &loc;
+       p = trap[0];
+       if (p) {
+               trap[0] = NULL;
+               evalstring(p, 0);
+       }
+       flush_stdout_stderr();
+ out:
+       setjobctl(0);
+       _exit(status);
+       /* NOTREACHED */
+}
 
-static void init(void)
+static void
+init(void)
 {
        /* from input.c: */
        basepf.nextc = basepf.buf = basebuf;
@@ -13002,7 +12608,7 @@ static void init(void)
        /* from var.c: */
        {
                char **envp;
-               char ppid[32];
+               char ppid[sizeof(int)*3 + 1];
                const char *p;
                struct stat st1, st2;
 
@@ -13013,7 +12619,7 @@ static void init(void)
                        }
                }
 
-               snprintf(ppid, sizeof(ppid), "%d", (int) getppid());
+               snprintf(ppid, sizeof(ppid), "%u", (unsigned) getppid());
                setvar("PPID", ppid, 0);
 
                p = lookupvar("PWD");
@@ -13126,6 +12732,13 @@ static short profile_buf[16384];
 extern int etext();
 #endif
 
+/*
+ * Main routine.  We initialize things, parse the arguments, execute
+ * profiles if we're a login shell, and then call cmdloop to execute
+ * commands.  The setjmp call sets up the location to jump to when an
+ * exception occurs.  When an exception occurs the variable "state"
+ * is used to figure out how far we had gotten.
+ */
 int ash_main(int argc, char **argv);
 int ash_main(int argc, char **argv)
 {
@@ -13134,10 +12747,6 @@ int ash_main(int argc, char **argv)
        struct jmploc jmploc;
        struct stackmark smark;
 
-#ifdef __GLIBC__
-       dash_errno = __errno_location();
-#endif
-
 #if PROFILE
        monitor(4, etext, profile_buf, sizeof(profile_buf), 50);
 #endif