Merge branch 'busybox' into merge

17 files changed, 274 insertions, 166 deletions

diff --git a/shell/ash.c b/shell/ash.c
index e9850f493..21fc05f01 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -607,11 +607,12 @@ flush_stdout_stderr(void)
         INT_ON;
 }
 
+/* Was called outcslow(c,FILE*), but c was always '\n' */
 static void
-outcslow(int c, FILE *dest)
+newline_and_flush(FILE *dest)
 {
         INT_OFF;
-        putc(c, dest);
+        putc('\n', dest);
         fflush(dest);
         INT_ON;
 }
@@ -1272,7 +1273,7 @@ ash_vmsg(const char *msg, va_list ap)
                         fprintf(stderr, "line %d: ", startlinno);
         }
         vfprintf(stderr, msg, ap);
-        outcslow('\n', stderr);
+        newline_and_flush(stderr);
 }
 
 /*
@@ -3528,6 +3529,7 @@ unaliascmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #define SHOW_ONLY_PGID  0x01    /* show only pgid (jobs -p) */
 #define SHOW_PIDS       0x02    /* show individual pids, not just one line per job */
 #define SHOW_CHANGED    0x04    /* only jobs whose state has changed */
+#define SHOW_STDERR     0x08    /* print to stderr (else stdout) */
 
 /*
  * A job structure contains information about a job.  A job is either a
@@ -4046,7 +4048,7 @@ showpipe(struct job *jp /*, FILE *out*/)
         psend = jp->ps + jp->nprocs;
         for (ps = jp->ps + 1; ps < psend; ps++)
                 printf(" | %s", ps->ps_cmd);
-        outcslow('\n', stdout);
+        newline_and_flush(stdout);
         flush_stdout_stderr();
 }
 
@@ -4106,39 +4108,33 @@ fg_bgcmd(int argc UNUSED_PARAM, char **argv)
 #endif
 
 static int
-sprint_status(char *s, int status, int sigonly)
+sprint_status48(char *s, int status, int sigonly)
 {
         int col;
         int st;
 
         col = 0;
         if (!WIFEXITED(status)) {
-#if JOBS
-                if (WIFSTOPPED(status))
+                if (JOBS && WIFSTOPPED(status))
                         st = WSTOPSIG(status);
                 else
-#endif
                         st = WTERMSIG(status);
                 if (sigonly) {
                         if (st == SIGINT || st == SIGPIPE)
                                 goto out;
-#if JOBS
-                        if (WIFSTOPPED(status))
+                        if (JOBS && WIFSTOPPED(status))
                                 goto out;
-#endif
                 }
                 st &= 0x7f;
 //TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata
                 col = fmtstr(s, 32, strsignal(st));
                 if (WCOREDUMP(status)) {
-                        col += fmtstr(s + col, 16, " (core dumped)");
+                        strcpy(s + col, " (core dumped)");
+                        col += sizeof(" (core dumped)")-1;
                 }
         } else if (!sigonly) {
                 st = WEXITSTATUS(status);
-                if (st)
-                        col = fmtstr(s, 16, "Done(%d)", st);
-                else
-                        col = fmtstr(s, 16, "Done");
+                col = fmtstr(s, 16, (st ? "Done(%d)" : "Done"), st);
         }
  out:
         return col;
@@ -4224,7 +4220,6 @@ dowait(int wait_flags, struct job *job)
         int status;
         struct job *jp;
         struct job *thisjob;
-        int state;
 
         TRACE(("dowait(0x%x) called\n", wait_flags));
 
@@ -4246,11 +4241,12 @@ dowait(int wait_flags, struct job *job)
         INT_OFF;
         thisjob = NULL;
         for (jp = curjob; jp; jp = jp->prev_job) {
+                int jobstate;
                 struct procstat *ps;
                 struct procstat *psend;
                 if (jp->state == JOBDONE)
                         continue;
-                state = JOBDONE;
+                jobstate = JOBDONE;
                 ps = jp->ps;
                 psend = ps + jp->nprocs;
                 do {
@@ -4264,41 +4260,41 @@ dowait(int wait_flags, struct job *job)
                                         ps->ps_pid = -1;
                         }
                         if (ps->ps_status == -1)
-                                state = JOBRUNNING;
+                                jobstate = JOBRUNNING;
 #if JOBS
-                        if (state == JOBRUNNING)
+                        if (jobstate == JOBRUNNING)
                                 continue;
                         if (WIFSTOPPED(ps->ps_status)) {
                                 jp->stopstatus = ps->ps_status;
-                                state = JOBSTOPPED;
+                                jobstate = JOBSTOPPED;
                         }
 #endif
                 } while (++ps < psend);
-                if (thisjob)
-                        goto gotjob;
-        }
-#if JOBS
-        if (!WIFSTOPPED(status))
-#endif
-                jobless--;
-        goto out;
-
- gotjob:
-        if (state != JOBRUNNING) {
-                thisjob->changed = 1;
+                if (!thisjob)
+                        continue;
 
-                if (thisjob->state != state) {
-                        TRACE(("Job %d: changing state from %d to %d\n",
-                                jobno(thisjob), thisjob->state, state));
-                        thisjob->state = state;
+                /* Found the job where one of its processes changed its state.
+                 * Is there at least one live and running process in this job? */
+                if (jobstate != JOBRUNNING) {
+                        /* No. All live processes in the job are stopped
+                         * (JOBSTOPPED) or there are no live processes (JOBDONE)
+                         */
+                        thisjob->changed = 1;
+                        if (thisjob->state != jobstate) {
+                                TRACE(("Job %d: changing state from %d to %d\n",
+                                        jobno(thisjob), thisjob->state, jobstate));
+                                thisjob->state = jobstate;
 #if JOBS
-                        if (state == JOBSTOPPED) {
-                                set_curjob(thisjob, CUR_STOPPED);
-                        }
+                                if (jobstate == JOBSTOPPED)
+                                        set_curjob(thisjob, CUR_STOPPED);
 #endif
+                        }
                 }
+                goto out;
         }
-
+        /* The process wasn't found in job list */
+        if (JOBS && !WIFSTOPPED(status))
+                jobless--;
  out:
         INT_ON;
 
@@ -4306,7 +4302,7 @@ dowait(int wait_flags, struct job *job)
                 char s[48 + 1];
                 int len;
 
-                len = sprint_status(s, status, 1);
+                len = sprint_status48(s, status, 1);
                 if (len) {
                         s[len] = '\n';
                         s[len + 1] = '\0';
@@ -4327,13 +4323,14 @@ blocking_wait_with_raise_on_sig(void)
 
 #if JOBS
 static void
-showjob(FILE *out, struct job *jp, int mode)
+showjob(struct job *jp, int mode)
 {
         struct procstat *ps;
         struct procstat *psend;
         int col;
         int indent_col;
-        char s[80];
+        char s[16 + 16 + 48];
+        FILE *out = (mode & SHOW_STDERR ? stderr : stdout);
 
         ps = jp->ps;
 
@@ -4363,7 +4360,7 @@ showjob(FILE *out, struct job *jp, int mode)
                 int status = psend[-1].ps_status;
                 if (jp->state == JOBSTOPPED)
                         status = jp->stopstatus;
-                col += sprint_status(s + col, status, 0);
+                col += sprint_status48(s + col, status, 0);
         }
         /* By now, "[JOBID]*  [maybe PID] STATUS" is printed */
 
@@ -4390,7 +4387,7 @@ showjob(FILE *out, struct job *jp, int mode)
                                 ps->ps_cmd
                 );
         } while (++ps != psend);
-        outcslow('\n', out);
+        newline_and_flush(out);
 
         jp->changed = 0;
 
@@ -4405,7 +4402,7 @@ showjob(FILE *out, struct job *jp, int mode)
  * statuses have changed since the last call to showjobs.
  */
 static void
-showjobs(FILE *out, int mode)
+showjobs(int mode)
 {
         struct job *jp;
 
@@ -4417,7 +4414,7 @@ showjobs(FILE *out, int mode)
 
         for (jp = curjob; jp; jp = jp->prev_job) {
                 if (!(mode & SHOW_CHANGED) || jp->changed) {
-                        showjob(out, jp, mode);
+                        showjob(jp, mode);
                 }
         }
 }
@@ -4438,10 +4435,10 @@ jobscmd(int argc UNUSED_PARAM, char **argv)
         argv = argptr;
         if (*argv) {
                 do
-                        showjob(stdout, getjob(*argv, 0), mode);
+                        showjob(getjob(*argv, 0), mode);
                 while (*++argv);
         } else {
-                showjobs(stdout, mode);
+                showjobs(mode);
         }
 
         return 0;
@@ -5894,8 +5891,8 @@ cvtnum(arith_t num)
 {
         int len;
 
-        expdest = makestrspace(32, expdest);
-        len = fmtstr(expdest, 32, ARITH_FMT, num);
+        expdest = makestrspace(sizeof(arith_t)*3 + 2, expdest);
+        len = fmtstr(expdest, sizeof(arith_t)*3 + 2, ARITH_FMT, num);
         STADJUST(len, expdest);
         return len;
 }
@@ -7326,10 +7323,11 @@ expmeta(char *expdir, char *enddir, char *name)
         struct dirent *dp;
         int atend;
         int matchdot;
+        int esc;
 
         metaflag = 0;
         start = name;
-        for (p = name; *p; p++) {
+        for (p = name; esc = 0, *p; p += esc + 1) {
                 if (*p == '*' || *p == '?')
                         metaflag = 1;
                 else if (*p == '[') {
@@ -7346,15 +7344,16 @@ expmeta(char *expdir, char *enddir, char *name)
                                         break;
                                 }
                         }
-                } else if (*p == '\\')
-                        p++;
-                else if (*p == '/') {
-                        if (metaflag)
-                                goto out;
-                        start = p + 1;
+                } else {
+                        if (*p == '\\')
+                                esc++;
+                        if (p[esc] == '/') {
+                                if (metaflag)
+                                        break;
+                                start = p + esc + 1;
+                        }
                 }
         }
- out:
         if (metaflag == 0) {    /* we've reached the end of the file name */
                 if (enddir != expdir)
                         metaflag++;
@@ -7394,7 +7393,8 @@ expmeta(char *expdir, char *enddir, char *name)
                 atend = 1;
         } else {
                 atend = 0;
-                *endname++ = '\0';
+                *endname = '\0';
+                endname += esc + 1;
         }
         matchdot = 0;
         p = start;
@@ -7419,7 +7419,7 @@ expmeta(char *expdir, char *enddir, char *name)
         }
         closedir(dirp);
         if (!atend)
-                endname[-1] = '/';
+                endname[-esc - 1] = esc ? '\\' : '/';
 }
 
 static struct strlist *
@@ -10118,7 +10118,7 @@ preadfd(void)
                         }
 # if ENABLE_ASH_IDLE_TIMEOUT
                         else if (errno == EAGAIN && timeout > 0) {
-                                printf("\007timed out waiting for input: auto-logout\n");
+                                puts("\007timed out waiting for input: auto-logout");
                                 exitshell();
                         }
 # endif
@@ -10472,10 +10472,8 @@ setinputstring(char *string)
 
 #if ENABLE_ASH_MAIL
 
-#define MAXMBOXES 10
-
-/* times of mailboxes */
-static time_t mailtime[MAXMBOXES];
+/* Hash of mtimes of mailboxes */
+static unsigned mailtime_hash;
 /* Set if MAIL or MAILPATH is changed. */
 static smallint mail_var_path_changed;
 
@@ -10491,13 +10489,14 @@ chkmail(void)
         const char *mpath;
         char *p;
         char *q;
-        time_t *mtp;
+        unsigned new_hash;
         struct stackmark smark;
         struct stat statb;
 
         setstackmark(&smark);
         mpath = mpathset() ? mpathval() : mailval();
-        for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
+        new_hash = 0;
+        for (;;) {
                 p = path_advance(&mpath, nullstr);
                 if (p == NULL)
                         break;
@@ -10511,16 +10510,15 @@ chkmail(void)
 #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, "%s\n",
-                                pathopt ? pathopt : "you have mail"
-                        );
-                }
-                *mtp = statb.st_mtime;
+                /* Very simplistic "hash": just a sum of all mtimes */
+                new_hash += (unsigned)statb.st_mtime;
+        }
+        if (!mail_var_path_changed && mailtime_hash != new_hash) {
+                if (mailtime_hash != 0)
+                        out2str("you have mail\n");
+                mailtime_hash = new_hash;
         }
         mail_var_path_changed = 0;
         popstackmark(&smark);
@@ -10792,9 +10790,11 @@ getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *opt
         char c = '?';
         int done = 0;
         int err = 0;
-        char s[12];
+        char sbuf[2];
         char **optnext;
 
+        sbuf[1] = '\0';
+
         if (*param_optind < 1)
                 return 1;
         optnext = optfirst + *param_optind - 1;
@@ -10821,9 +10821,9 @@ getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *opt
         for (q = optstr; *q != c;) {
                 if (*q == '\0') {
                         if (optstr[0] == ':') {
-                                s[0] = c;
-                                s[1] = '\0';
-                                err |= setvarsafe("OPTARG", s, 0);
+                                sbuf[0] = c;
+                                /*sbuf[1] = '\0'; - already is */
+                                err |= setvarsafe("OPTARG", sbuf, 0);
                         } else {
                                 fprintf(stderr, "Illegal option -%c\n", c);
                                 unsetvar("OPTARG");
@@ -10838,9 +10838,9 @@ getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *opt
         if (*++q == ':') {
                 if (*p == '\0' && (p = *optnext) == NULL) {
                         if (optstr[0] == ':') {
-                                s[0] = c;
-                                s[1] = '\0';
-                                err |= setvarsafe("OPTARG", s, 0);
+                                sbuf[0] = c;
+                                /*sbuf[1] = '\0'; - already is */
+                                err |= setvarsafe("OPTARG", sbuf, 0);
                                 c = ':';
                         } else {
                                 fprintf(stderr, "No arg for -%c option\n", c);
@@ -10859,11 +10859,10 @@ getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *opt
  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);
+        err |= setvarsafe("OPTIND", itoa(*param_optind), VNOFUNC);
+        sbuf[0] = c;
+        /*sbuf[1] = '\0'; - already is */
+        err |= setvarsafe(optvar, sbuf, 0);
         if (err) {
                 *param_optind = 1;
                 *optoff = -1;
@@ -12559,7 +12558,7 @@ cmdloop(int top)
                 setstackmark(&smark);
 #if JOBS
                 if (doing_jobctl)
-                        showjobs(stderr, SHOW_CHANGED);
+                        showjobs(SHOW_CHANGED|SHOW_STDERR);
 #endif
                 inter = 0;
                 if (iflag && top) {
@@ -13298,21 +13297,11 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 }
 
 static int FAST_FUNC
-umaskcmd(int argc UNUSED_PARAM, char **argv)
-{
-        static const char permuser[3] ALIGN1 = "ugo";
-        static const char permmode[3] ALIGN1 = "rwx";
-        static const short permmask[] ALIGN2 = {
-                S_IRUSR, S_IWUSR, S_IXUSR,
-                S_IRGRP, S_IWGRP, S_IXGRP,
-                S_IROTH, S_IWOTH, S_IXOTH
-        };
-
-        /* TODO: use bb_parse_mode() instead */
+umaskcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        static const char permuser[3] ALIGN1 = "ogu";
 
-        char *ap;
         mode_t mask;
-        int i;
         int symbolic_mode = 0;
 
         while (nextopt("S") != '\0') {
@@ -13324,45 +13313,43 @@ umaskcmd(int argc UNUSED_PARAM, char **argv)
         umask(mask);
         INT_ON;
 
-        ap = *argptr;
-        if (ap == NULL) {
+        if (*argptr == NULL) {
                 if (symbolic_mode) {
-                        char buf[18];
+                        char buf[sizeof(",u=rwx,g=rwx,o=rwx")];
                         char *p = buf;
+                        int i;
 
-                        for (i = 0; i < 3; i++) {
-                                int j;
-
+                        i = 2;
+                        for (;;) {
+                                *p++ = ',';
                                 *p++ = permuser[i];
                                 *p++ = '=';
-                                for (j = 0; j < 3; j++) {
-                                        if ((mask & permmask[3 * i + j]) == 0) {
-                                                *p++ = permmode[j];
-                                        }
-                                }
-                                *p++ = ',';
+                                /* mask is 0..0uuugggooo. i=2 selects uuu bits */
+                                if (!(mask & 0400)) *p++ = 'r';
+                                if (!(mask & 0200)) *p++ = 'w';
+                                if (!(mask & 0100)) *p++ = 'x';
+                                mask <<= 3;
+                                if (--i < 0)
+                                        break;
                         }
-                        *--p = 0;
-                        puts(buf);
+                        *p = '\0';
+                        puts(buf + 1);
                 } else {
-                        out1fmt("%.4o\n", mask);
+                        out1fmt("%04o\n", mask);
                 }
         } else {
-                if (isdigit((unsigned char) *ap)) {
-                        mask = 0;
-                        do {
-                                if (*ap >= '8' || *ap < '0')
-                                        ash_msg_and_raise_error(msg_illnum, argv[1]);
-                                mask = (mask << 3) + (*ap - '0');
-                        } while (*++ap != '\0');
-                        umask(mask);
-                } else {
-                        mask = ~mask & 0777;
-                        if (!bb_parse_mode(ap, &mask)) {
-                                ash_msg_and_raise_error("illegal mode: %s", ap);
-                        }
-                        umask(~mask & 0777);
-                }
+                char *modestr = *argptr;
+                /* numeric umasks are taken as-is */
+                /* symbolic umasks are inverted: "umask a=rx" calls umask(222) */
+                if (!isdigit(modestr[0]))
+                        mask ^= 0777;
+                mask = bb_parse_mode(modestr, mask);
+                if ((unsigned)mask > 0777) {
+                        ash_msg_and_raise_error("illegal mode: %s", modestr);
+                }
+                if (!isdigit(modestr[0]))
+                        mask ^= 0777;
+                umask(mask);
         }
         return 0;
 }
@@ -13713,7 +13700,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                         exitshell();
                 }
                 if (e == EXINT) {
-                        outcslow('\n', stderr);
+                        newline_and_flush(stderr);
                 }
 
                 popstackmark(&smark);
diff --git a/shell/ash_test/ash-glob/glob1.right b/shell/ash_test/ash-glob/glob1.right
new file mode 100644
index 000000000..f29ab4e65
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob1.right
@@ -0,0 +1,2 @@
+glob1.tests
+glob1.tests
diff --git a/shell/ash_test/ash-glob/glob1.tests b/shell/ash_test/ash-glob/glob1.tests
new file mode 100755
index 000000000..f980ce064
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob1.tests
@@ -0,0 +1,2 @@
+echo *glob1?t[e]sts*
+echo "glob1"?'t'[e]s*
diff --git a/shell/ash_test/ash-glob/glob2.right b/shell/ash_test/ash-glob/glob2.right
new file mode 100644
index 000000000..7a70c2263
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob2.right
@@ -0,0 +1,18 @@
+Expected Actual
+Z\*    : Z\*
+Z*     : Z*
+Z\f    : Z\f
+Z\*    : Z\*
+
+Z\z    : Z\z
+Zz     : Zz
+Z\z    : Z\z
+Z\z    : Z\z
+
+Z\     : Z\
+Z\     : Z\
+
+Z\f Zf : Z\f Zf
+Z\f Zf : Z\f Zf
+
+Done: 0
diff --git a/shell/ash_test/ash-glob/glob2.tests b/shell/ash_test/ash-glob/glob2.tests
new file mode 100755
index 000000000..00618b9db
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob2.tests
@@ -0,0 +1,27 @@
+# This test demonstrates that in unquoted $v, backslashes expand by this rule:
+# \z -> \\\z; \<eol> -> \\<eol> (for any z, special or not),
+# and subsequently globbing converts \\ to \ and treats \z as literal z
+# even if it is a special char.
+
+>'Zf'
+>'Z\f'
+        echo 'Expected' 'Actual'
+v='\*'; echo 'Z\*    :' Z$v    # ash is buggy here: prints 'Z\f'
+        echo 'Z*     :' Z\*
+        echo 'Z\f    :' Z\\*
+        echo 'Z\*    :' Z\\\*  # NB! only this matches Z$v output
+echo
+v='\z'; echo 'Z\z    :' Z$v
+        echo 'Zz     :' Z\z
+        echo 'Z\z    :' Z\\z
+        echo 'Z\z    :' Z\\\z
+echo
+v='\';  echo 'Z\     :' Z$v
+        echo 'Z\     :' Z\\
+echo
+v='*';  echo 'Z\f Zf :' Z$v
+        echo 'Z\f Zf :' Z*
+echo
+
+rm 'Z\f' 'Zf'
+echo Done: $?
diff --git a/shell/ash_test/ash-glob/glob3.right b/shell/ash_test/ash-glob/glob3.right
new file mode 100644
index 000000000..161b589e0
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob3.right
@@ -0,0 +1,2 @@
+glob3.tests
+./glob3.tests
diff --git a/shell/ash_test/ash-glob/glob3.tests b/shell/ash_test/ash-glob/glob3.tests
new file mode 100755
index 000000000..bdf54001e
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob3.tests
@@ -0,0 +1,2 @@
+echo "glob3.test"*
+echo "./glob3.test"*
diff --git a/shell/ash_test/ash-glob/glob_and_assign.right b/shell/ash_test/ash-glob/glob_and_assign.right
new file mode 100644
index 000000000..d46e44363
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob_and_assign.right
@@ -0,0 +1,6 @@
+ZVAR=z.tmp ZVAR=*.tmp ZVAR=[z].tmp
+ZVAR=z.tmp ZVAR=*.tmp ZVAR=[z].tmp
+*.tmp
+ZVAR=z.tmp z.tmp
+ZVAR=z.tmp ZVAR=*.tmp ZVAR=[z].tmp
+ZVAR=z.tmp ZVAR=*.tmp ZVAR=[z].tmp
diff --git a/shell/ash_test/ash-glob/glob_and_assign.tests b/shell/ash_test/ash-glob/glob_and_assign.tests
new file mode 100755
index 000000000..0b158f20f
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob_and_assign.tests
@@ -0,0 +1,10 @@
+>ZVAR=z.tmp
+>z.tmp
+ZVAR=*.tmp echo ZVAR=*.tmp "ZVAR=*.tmp" "ZVAR=[z].tmp"
+ZVAR=*.tmp /bin/echo ZVAR=*.tmp "ZVAR=*.tmp" "ZVAR=[z].tmp"
+ZVAR=*.tmp
+echo "$ZVAR"
+echo $ZVAR
+echo ZVAR=*.tmp "ZVAR=*.tmp" "ZVAR=[z].tmp"
+/bin/echo ZVAR=*.tmp "ZVAR=*.tmp" "ZVAR=[z].tmp"
+rm ZVAR=z.tmp z.tmp
diff --git a/shell/ash_test/ash-glob/glob_redir.right b/shell/ash_test/ash-glob/glob_redir.right
new file mode 100644
index 000000000..fbd0309b0
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob_redir.right
@@ -0,0 +1,2 @@
+z.tmp:
+?.tmp: TEST
diff --git a/shell/ash_test/ash-glob/glob_redir.tests b/shell/ash_test/ash-glob/glob_redir.tests
new file mode 100755
index 000000000..621d12017
--- /dev/null
+++ b/shell/ash_test/ash-glob/glob_redir.tests
@@ -0,0 +1,9 @@
+# Redirections are not globbed.
+# bash:
+# if run as "sh", they are not globbed, but
+# if run as "bash", they are!
+>z.tmp
+echo TEST >?.tmp
+echo 'z.tmp:' `cat 'z.tmp'`
+echo '?.tmp:' `cat '?.tmp'`
+rm 'z.tmp' '?.tmp'
diff --git a/shell/hush.c b/shell/hush.c
index 3ca04494c..eabe83ac6 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1479,10 +1479,11 @@ static sighandler_t install_sighandler(int sig, sighandler_t handler)
 
 #if ENABLE_HUSH_JOB
 
+static void xfunc_has_died(void);
 /* After [v]fork, in child: do not restore tty pgrp on xfunc death */
-# define disable_restore_tty_pgrp_on_exit() (die_sleep = 0)
+# define disable_restore_tty_pgrp_on_exit() (die_func = NULL)
 /* After [v]fork, in parent: restore tty pgrp on xfunc death */
-# define enable_restore_tty_pgrp_on_exit()  (die_sleep = -1)
+# define enable_restore_tty_pgrp_on_exit()  (die_func = xfunc_has_died)
 
 /* Restores tty foreground process group, and exits.
  * May be called as signal handler for fatal signal
@@ -1587,6 +1588,15 @@ static void hush_exit(int exitcode)
 #endif
 }
 
+static void xfunc_has_died(void) NORETURN;
+static void xfunc_has_died(void)
+{
+        /* xfunc has failed! die die die */
+        /* no EXIT traps, this is an escape hatch! */
+        G.exiting = 1;
+        hush_exit(xfunc_error_retval);
+}
+
 
 //TODO: return a mask of ALL handled sigs?
 static int check_and_run_traps(void)
@@ -3161,11 +3171,29 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
                 old->command->group = ctx->list_head;
                 old->command->cmd_type = CMD_NORMAL;
 # if !BB_MMU
-                o_addstr(&old->as_string, ctx->as_string.data);
-                o_free_unsafe(&ctx->as_string);
-                old->command->group_as_string = xstrdup(old->as_string.data);
-                debug_printf_parse("pop, remembering as:'%s'\n",
-                                old->command->group_as_string);
+                /* At this point, the compound command's string is in
+                 * ctx->as_string... except for the leading keyword!
+                 * Consider this example: "echo a | if true; then echo a; fi"
+                 * ctx->as_string will contain "true; then echo a; fi",
+                 * with "if " remaining in old->as_string!
+                 */
+                {
+                        char *str;
+                        int len = old->as_string.length;
+                        /* Concatenate halves */
+                        o_addstr(&old->as_string, ctx->as_string.data);
+                        o_free_unsafe(&ctx->as_string);
+                        /* Find where leading keyword starts in first half */
+                        str = old->as_string.data + len;
+                        if (str > old->as_string.data)
+                                str--; /* skip whitespace after keyword */
+                        while (str > old->as_string.data && isalpha(str[-1]))
+                                str--;
+                        /* Ugh, we're done with this horrid hack */
+                        old->command->group_as_string = xstrdup(str);
+                        debug_printf_parse("pop, remembering as:'%s'\n",
+                                        old->command->group_as_string);
+                }
 # endif
                 *ctx = *old;   /* physical copy */
                 free(old);
@@ -4248,7 +4276,7 @@ static struct pipe *parse_stream(char **pstring,
                                 pi = NULL;
                         }
 #if !BB_MMU
-                        debug_printf_parse("as_string '%s'\n", ctx.as_string.data);
+                        debug_printf_parse("as_string1 '%s'\n", ctx.as_string.data);
                         if (pstring)
                                 *pstring = ctx.as_string.data;
                         else
@@ -4399,7 +4427,7 @@ static struct pipe *parse_stream(char **pstring,
                         ) {
                                 o_free(&dest);
 #if !BB_MMU
-                                debug_printf_parse("as_string '%s'\n", ctx.as_string.data);
+                                debug_printf_parse("as_string2 '%s'\n", ctx.as_string.data);
                                 if (pstring)
                                         *pstring = ctx.as_string.data;
                                 else
@@ -4639,9 +4667,6 @@ static struct pipe *parse_stream(char **pstring,
                                  * with redirect_opt_num(), but bash doesn't do it.
                                  * "echo foo 2| cat" yields "foo 2". */
                                 done_command(&ctx);
-#if !BB_MMU
-                                o_reset_to_empty_unquoted(&ctx.as_string);
-#endif
                         }
                         goto new_cmd;
                 case '(':
@@ -6779,7 +6804,7 @@ static int checkjobs(struct pipe *fg_pipe)
                                                 int sig = WTERMSIG(status);
                                                 if (i == fg_pipe->num_cmds-1)
                                                         /* TODO: use strsignal() instead for bash compat? but that's bloat... */
-                                                        printf("%s\n", sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig));
+                                                        puts(sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig));
                                                 /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */
                                                 /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here?
                                                  * Maybe we need to use sig | 128? */
@@ -7851,12 +7876,7 @@ int hush_main(int argc, char **argv)
         /* Initialize some more globals to non-zero values */
         cmdedit_update_prompt();
 
-        if (setjmp(die_jmp)) {
-                /* xfunc has failed! die die die */
-                /* no EXIT traps, this is an escape hatch! */
-                G.exiting = 1;
-                hush_exit(xfunc_error_retval);
-        }
+        die_func = xfunc_has_died;
 
         /* Shell is non-interactive at first. We need to call
          * install_special_sighandlers() if we are going to execute "sh <script>",
@@ -8114,9 +8134,7 @@ int hush_main(int argc, char **argv)
                         /* Grab control of the terminal */
                         tcsetpgrp(G_interactive_fd, getpid());
                 }
-                /* -1 is special - makes xfuncs longjmp, not exit
-                 * (we reset die_sleep = 0 whereever we [v]fork) */
-                enable_restore_tty_pgrp_on_exit(); /* sets die_sleep = -1 */
+                enable_restore_tty_pgrp_on_exit();
 
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {
@@ -8950,24 +8968,29 @@ static int FAST_FUNC builtin_umask(char **argv)
         int rc;
         mode_t mask;
 
+        rc = 1;
         mask = umask(0);
         argv = skip_dash_dash(argv);
         if (argv[0]) {
                 mode_t old_mask = mask;
 
-                mask ^= 0777;
-                rc = bb_parse_mode(argv[0], &mask);
-                mask ^= 0777;
-                if (rc == 0) {
+                /* numeric umasks are taken as-is */
+                /* symbolic umasks are inverted: "umask a=rx" calls umask(222) */
+                if (!isdigit(argv[0][0]))
+                        mask ^= 0777;
+                mask = bb_parse_mode(argv[0], mask);
+                if (!isdigit(argv[0][0]))
+                        mask ^= 0777;
+                if ((unsigned)mask > 0777) {
                         mask = old_mask;
                         /* bash messages:
                          * bash: umask: 'q': invalid symbolic mode operator
                          * bash: umask: 999: octal number out of range
                          */
                         bb_error_msg("%s: invalid mode '%s'", "umask", argv[0]);
+                        rc = 0;
                 }
         } else {
-                rc = 1;
                 /* Mimic bash */
                 printf("%04o\n", (unsigned) mask);
                 /* fall through and restore mask which we set to 0 */
@@ -9097,12 +9120,9 @@ static int FAST_FUNC builtin_wait(char **argv)
                         return EXIT_FAILURE;
                 }
                 if (waitpid(pid, &status, 0) == pid) {
+                        ret = WEXITSTATUS(status);
                         if (WIFSIGNALED(status))
                                 ret = 128 + WTERMSIG(status);
-                        else if (WIFEXITED(status))
-                                ret = WEXITSTATUS(status);
-                        else /* wtf? */
-                                ret = EXIT_FAILURE;
                 } else {
                         bb_perror_msg("wait %s", *argv);
                         ret = 127;
diff --git a/shell/hush_test/hush-glob/glob3.right b/shell/hush_test/hush-glob/glob3.right
new file mode 100644
index 000000000..161b589e0
--- /dev/null
+++ b/shell/hush_test/hush-glob/glob3.right
@@ -0,0 +1,2 @@
+glob3.tests
+./glob3.tests
diff --git a/shell/hush_test/hush-glob/glob3.tests b/shell/hush_test/hush-glob/glob3.tests
new file mode 100755
index 000000000..bdf54001e
--- /dev/null
+++ b/shell/hush_test/hush-glob/glob3.tests
@@ -0,0 +1,2 @@
+echo "glob3.test"*
+echo "./glob3.test"*
diff --git a/shell/hush_test/hush-misc/nommu3.right b/shell/hush_test/hush-misc/nommu3.right
new file mode 100644
index 000000000..da1534bef
--- /dev/null
+++ b/shell/hush_test/hush-misc/nommu3.right
@@ -0,0 +1,2 @@
+Ok
+0
diff --git a/shell/hush_test/hush-misc/nommu3.tests b/shell/hush_test/hush-misc/nommu3.tests
new file mode 100755
index 000000000..ac82a6a11
--- /dev/null
+++ b/shell/hush_test/hush-misc/nommu3.tests
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+func()
+{
+        while read p; do echo "$p"; done
+}
+
+pipe_to_func()
+{
+        # We had a NOMMU bug which caused "echo Ok |" part to be lost
+        echo Ok | func
+}
+
+pipe_to_func | cat
+echo $?
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 1567d1de4..dbd4286bf 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -387,7 +387,7 @@ static void printlim(unsigned opts, const struct rlimit *limit,
                 val = limit->rlim_cur;
 
         if (val == RLIM_INFINITY)
-                printf("unlimited\n");
+                puts("unlimited");
         else {
                 val >>= l->factor_shift;
                 printf("%llu\n", (long long) val);