Merge branch 'busybox' into merge

33 files changed, 343 insertions, 103 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 1f57c2d7e..b8f75af05 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -240,17 +240,17 @@
 #define IF_BASH_SUBSTR              IF_ASH_BASH_COMPAT
 /* BASH_TEST2: [[ EXPR ]]
  * Status of [[ support:
- * We replace && and || with -a and -o
+ *   && and || work as they should
+ *   = is glob match operator, not equality operator: STR = GLOB
+ *   == same as =
+ *   =~ is regex match operator: STR =~ REGEX
  * TODO:
  * singleword+noglob expansion:
  *   v='a b'; [[ $v = 'a b' ]]; echo 0:$?
  *   [[ /bin/n* ]]; echo 0:$?
- * -a/-o are not AND/OR ops! (they are just strings)
  * quoting needs to be considered (-f is an operator, "-f" and ""-f are not; etc)
- * = is glob match operator, not equality operator: STR = GLOB
- * (in GLOB, quoting is significant on char-by-char basis: a*cd"*")
- * == same as =
- * add =~ regex match operator: STR =~ REGEX
+ * ( ) < > should not have special meaning (IOW: should not require quoting)
+ * in word = GLOB, quoting should be significant on char-by-char basis: a*cd"*"
  */
 #define    BASH_TEST2           (ENABLE_ASH_BASH_COMPAT * ENABLE_ASH_TEST)
 #define    BASH_SOURCE          ENABLE_ASH_BASH_COMPAT
@@ -3173,7 +3173,7 @@ updatepwd(const char *dir)
                         lim++;
                 }
         }
-        p = strtok(cdcomppath, "/");
+        p = strtok_r(cdcomppath, "/", &cdcomppath);
         while (p) {
                 switch (*p) {
                 case '.':
@@ -3192,7 +3192,7 @@ updatepwd(const char *dir)
                         new = stack_putstr(p, new);
                         USTPUTC('/', new);
                 }
-                p = strtok(NULL, "/");
+                p = strtok_r(NULL, "/", &cdcomppath);
         }
         if (new > lim)
                 STUNPUTC(new);
@@ -4780,61 +4780,54 @@ waitpid_child(int *status, int wait_flags)
         return pid;
 }
 #define waitpid(p, s, f) waitpid_child(s, f)
-#define wait_block_or_sig(s) waitpid_child(s, 0)
+#endif
 
-#else
+#define DOWAIT_NONBLOCK 0
+#define DOWAIT_BLOCK    1
+#define DOWAIT_BLOCK_OR_SIG 2
+#if BASH_WAIT_N
+# define DOWAIT_JOBSTATUS 0x10   /* OR this to get job's exitstatus instead of pid */
+#endif
 
 static int
-wait_block_or_sig(int *status)
+waitproc(int block, int *status)
 {
-        int pid;
+#if !ENABLE_PLATFORM_MINGW32
+        sigset_t oldmask;
+        int flags = block == DOWAIT_BLOCK ? 0 : WNOHANG;
+        int err;
 
-        do {
-                sigset_t mask;
+#if JOBS
+        if (doing_jobctl)
+                flags |= WUNTRACED;
+#endif
 
-                /* Poll all children for changes in their state */
+        do {
                 got_sigchld = 0;
-                /* if job control is active, accept stopped processes too */
-                pid = waitpid(-1, status, doing_jobctl ? (WNOHANG|WUNTRACED) : WNOHANG);
-                if (pid != 0)
-                        break; /* Error (e.g. EINTR, ECHILD) or pid */
+                do
+                        err = waitpid(-1, status, flags);
+                while (err < 0 && errno == EINTR);
 
-                /* Children exist, but none are ready. Sleep until interesting signal */
-#if 1
-                sigfillset(&mask);
-                sigprocmask2(SIG_SETMASK, &mask); /* mask is updated */
-                while (!got_sigchld && !pending_sig) {
-                        sigsuspend(&mask);
-                        /* ^^^ add "sigdelset(&mask, SIGCHLD);" before sigsuspend
-                         * to make sure SIGCHLD is not masked off?
-                         * It was reported that this:
-                         *      fn() { : | return; }
-                         *      shopt -s lastpipe
-                         *      fn
-                         *      exec ash SCRIPT
-                         * under bash 4.4.23 runs SCRIPT with SIGCHLD masked,
-                         * making "wait" commands in SCRIPT block forever.
-                         */
-                }
-                sigprocmask(SIG_SETMASK, &mask, NULL);
-#else /* unsafe: a signal can set pending_sig after check, but before pause() */
+                if (err || (err = -!block))
+                        break;
+
+                sigfillset(&oldmask);
+                sigprocmask2(SIG_SETMASK, &oldmask); /* mask is updated */
                 while (!got_sigchld && !pending_sig)
-                        pause();
-#endif
+                        sigsuspend(&oldmask);
+                sigprocmask(SIG_SETMASK, &oldmask, NULL);
+                //simpler, but unsafe: a signal can set pending_sig after check, but before pause():
+                //while (!got_sigchld && !pending_sig)
+                //      pause();
 
-                /* If it was SIGCHLD, poll children again */
         } while (got_sigchld);
 
-        return pid;
-}
-#endif
-
-#define DOWAIT_NONBLOCK 0
-#define DOWAIT_BLOCK    1
-#define DOWAIT_BLOCK_OR_SIG 2
-#if BASH_WAIT_N
-# define DOWAIT_JOBSTATUS 0x10   /* OR this to get job's exitstatus instead of pid */
+        return err;
+#else
+        int flags = block == DOWAIT_BLOCK ? 0 : WNOHANG;
+        return waitpid(-1, status, flags);
 #endif
+}
 
 static int
 waitone(int block, struct job *job)
@@ -4842,7 +4835,7 @@ waitone(int block, struct job *job)
         int pid;
         int status;
         struct job *jp;
-        struct job *thisjob;
+        struct job *thisjob = NULL;
 #if BASH_WAIT_N
         bool want_jobexitstatus = (block & DOWAIT_JOBSTATUS);
         block = (block & ~DOWAIT_JOBSTATUS);
@@ -4869,21 +4862,8 @@ waitone(int block, struct job *job)
          * SIG_DFL handler does not wake sigsuspend().
          */
         INT_OFF;
-        if (block == DOWAIT_BLOCK_OR_SIG) {
-                pid = wait_block_or_sig(&status);
-        } else {
-                int wait_flags = 0;
-                if (block == DOWAIT_NONBLOCK)
-                        wait_flags = WNOHANG;
-                /* if job control is active, accept stopped processes too */
-                if (doing_jobctl)
-                        wait_flags |= WUNTRACED;
-                /* NB: _not_ safe_waitpid, we need to detect EINTR */
-                pid = waitpid(-1, &status, wait_flags);
-        }
-        TRACE(("wait returns pid=%d, status=0x%x, errno=%d(%s)\n",
-                                pid, status, errno, strerror(errno)));
-        thisjob = NULL;
+        pid = waitproc(block, &status);
+        TRACE(("wait returns pid %d, status=%d\n", pid, status));
         if (pid <= 0)
                 goto out;
 
@@ -4971,21 +4951,35 @@ static int
 dowait(int block, struct job *jp)
 {
 #if !ENABLE_PLATFORM_MINGW32
-        int pid = block == DOWAIT_NONBLOCK ? got_sigchld : 1;
+        smallint gotchld = *(volatile smallint *)&got_sigchld;
+        int rpid;
+        int pid;
+
+        if (jp && jp->state != JOBRUNNING)
+                block = DOWAIT_NONBLOCK;
+
+        if (block == DOWAIT_NONBLOCK && !gotchld)
+                return 1;
+
+        rpid = 1;
 
-        while (jp ? jp->state == JOBRUNNING : pid > 0) {
-                if (!jp)
-                        got_sigchld = 0;
+        do {
                 pid = waitone(block, jp);
-        }
+                rpid &= !!pid;
+
+                if (!pid || (jp && jp->state != JOBRUNNING))
+                        block = DOWAIT_NONBLOCK;
+        } while (pid >= 0);
+
+        return rpid;
 #else
         int pid = 1;
 
         while (jp ? jp->state == JOBRUNNING : pid > 0)
                 pid = waitone(block, jp);
-#endif
 
         return pid;
+#endif
 }
 
 #if JOBS
@@ -5232,7 +5226,7 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
                         job = getjob(*argv, 0);
                 }
                 /* loop until process terminated or stopped */
-                dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+                dowait(DOWAIT_BLOCK_OR_SIG, job);
                 if (pending_sig)
                         goto sigout;
                 job->waited = 1;
@@ -12622,7 +12616,8 @@ simplecmd(void)
                                 tokpushback = 1;
                                 goto out;
                         }
-                        wordtext = (char *) (t == TAND ? "-a" : "-o");
+                        /* pass "&&" or "||" to [[ ]] as literal args */
+                        wordtext = (char *) (t == TAND ? "&&" : "||");
 #endif
                 case TWORD:
                         n = stzalloc(sizeof(struct narg));
@@ -13600,7 +13595,7 @@ parsebackq: {
                                 goto done;
 
                         case '\\':
-                                pc = pgetc(); /* or pgetc_eatbnl()? why (example)? */
+                                pc = pgetc(); /* not pgetc_eatbnl! */
                                 if (pc != '\\' && pc != '`' && pc != '$'
                                  && (!synstack->dblquote || pc != '"')
                                 ) {
diff --git a/shell/ash_test/ash-misc/wait7.right b/shell/ash_test/ash-misc/wait7.right
new file mode 100644
index 000000000..4b6445841
--- /dev/null
+++ b/shell/ash_test/ash-misc/wait7.right
@@ -0,0 +1,2 @@
+Background1
+Ok:0
diff --git a/shell/ash_test/ash-misc/wait7.tests b/shell/ash_test/ash-misc/wait7.tests
new file mode 100755
index 000000000..a54a778e5
--- /dev/null
+++ b/shell/ash_test/ash-misc/wait7.tests
@@ -0,0 +1,7 @@
+sleep 1 && echo "Background1" &
+pid=$!
+sleep 3 && echo "Background2: BUG!" &
+# Shouldn't wait for 2nd bkgd:
+wait $pid
+kill $!
+echo Ok:$?
diff --git a/shell/ash_test/ash-signals/usage.right b/shell/ash_test/ash-signals/usage.right
new file mode 100644
index 000000000..c0dbd6c3c
--- /dev/null
+++ b/shell/ash_test/ash-signals/usage.right
@@ -0,0 +1,14 @@
+___
+___
+___
+trap -- 'a' EXIT
+trap -- 'a' INT
+trap -- 'a' USR1
+trap -- 'a' USR2
+___
+___
+trap -- 'a' USR1
+trap -- 'a' USR2
+___
+___
+trap -- 'a' USR2
diff --git a/shell/ash_test/ash-signals/usage.tests b/shell/ash_test/ash-signals/usage.tests
new file mode 100755
index 000000000..d29c6e74a
--- /dev/null
+++ b/shell/ash_test/ash-signals/usage.tests
@@ -0,0 +1,23 @@
+# no output -- default state
+echo ___
+trap
+
+# assign some traps
+echo ___
+trap "a" EXIT INT USR1 USR2
+
+# show them all
+echo ___
+trap
+
+# clear one
+echo ___
+trap 0 INT
+echo ___
+trap
+
+# clear another
+echo ___
+trap "-" USR1
+echo ___
+trap
diff --git a/shell/hush.c b/shell/hush.c
index e9cec1cc9..ab7263381 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -63,7 +63,6 @@
  *      reserved words: function select
  *      advanced test: [[ ]]
  *      process substitution: <(list) and >(list)
- *      =~: regex operator
  *      let EXPR [EXPR...]
  *          Each EXPR is an arithmetic expression (ARITHMETIC EVALUATION)
  *          If the last arg evaluates to 0, let returns 1; 0 otherwise.
@@ -84,13 +83,12 @@
  * [[ args ]] are CMD_SINGLEWORD_NOGLOB:
  *   v='a b'; [[ $v = 'a b' ]]; echo 0:$?
  *   [[ /bin/n* ]]; echo 0:$?
+ *   = is glob match operator, not equality operator: STR = GLOB
+ *   == same as =
+ *   =~ is regex match operator: STR =~ REGEX
  * TODO:
- * &&/|| are AND/OR ops, -a/-o are not
  * quoting needs to be considered (-f is an operator, "-f" and ""-f are not; etc)
- * = is glob match operator, not equality operator: STR = GLOB
- * (in GLOB, quoting is significant on char-by-char basis: a*cd"*")
- * == same as =
- * add =~ regex match operator: STR =~ REGEX
+ * in word = GLOB, quoting should be significant on char-by-char basis: a*cd"*"
  */
 //config:config HUSH
 //config:       bool "hush (68 kb)"
@@ -651,14 +649,16 @@ struct command {
         smallint cmd_type;          /* CMD_xxx */
 #define CMD_NORMAL   0
 #define CMD_SUBSHELL 1
-#if BASH_TEST2 || ENABLE_HUSH_LOCAL || ENABLE_HUSH_EXPORT || ENABLE_HUSH_READONLY
-/* used for "[[ EXPR ]]", and to prevent word splitting and globbing in
- * "export v=t*"
- */
-# define CMD_SINGLEWORD_NOGLOB 2
+#if BASH_TEST2
+/* used for "[[ EXPR ]]" */
+# define CMD_TEST2_SINGLEWORD_NOGLOB 2
+#endif
+#if ENABLE_HUSH_LOCAL || ENABLE_HUSH_EXPORT || ENABLE_HUSH_READONLY
+/* used to prevent word splitting and globbing in "export v=t*" */
+# define CMD_SINGLEWORD_NOGLOB 3
 #endif
 #if ENABLE_HUSH_FUNCTIONS
-# define CMD_FUNCDEF 3
+# define CMD_FUNCDEF 4
 #endif
 
         smalluint cmd_exitcode;
@@ -4112,6 +4112,14 @@ static int done_word(struct parse_context *ctx)
                         ctx->ctx_dsemicolon = 0;
                 } else
 # endif
+# if defined(CMD_TEST2_SINGLEWORD_NOGLOB)
+                if (command->cmd_type == CMD_TEST2_SINGLEWORD_NOGLOB
+                 && strcmp(ctx->word.data, "]]") == 0
+                ) {
+                        /* allow "[[ ]] >file" etc */
+                        command->cmd_type = CMD_SINGLEWORD_NOGLOB;
+                } else
+# endif
                 if (!command->argv /* if it's the first word... */
 # if ENABLE_HUSH_LOOPS
                  && ctx->ctx_res_w != RES_FOR /* ...not after FOR or IN */
@@ -4146,11 +4154,13 @@ static int done_word(struct parse_context *ctx)
                                                 (ctx->ctx_res_w == RES_SNTX));
                                 return (ctx->ctx_res_w == RES_SNTX);
                         }
+# if defined(CMD_TEST2_SINGLEWORD_NOGLOB)
+                        if (strcmp(ctx->word.data, "[[") == 0) {
+                                command->cmd_type = CMD_TEST2_SINGLEWORD_NOGLOB;
+                        } else
+# endif
 # if defined(CMD_SINGLEWORD_NOGLOB)
                         if (0
-#  if BASH_TEST2
-                         || strcmp(ctx->word.data, "[[") == 0
-#  endif
                         /* In bash, local/export/readonly are special, args
                          * are assignments and therefore expansion of them
                          * should be "one-word" expansion:
@@ -4172,7 +4182,8 @@ static int done_word(struct parse_context *ctx)
                         ) {
                                 command->cmd_type = CMD_SINGLEWORD_NOGLOB;
                         }
-                        /* fall through */
+# else
+                        { /* empty block to pair "if ... else" */ }
 # endif
                 }
 #endif /* HAS_KEYWORDS */
@@ -5354,9 +5365,15 @@ static struct pipe *parse_stream(char **pstring,
                 if (ch != '\n')
                         next = i_peek_and_eat_bkslash_nl(input);
 
-                is_special = "{}<>;&|()#" /* special outside of "str" */
+                is_special = "{}<>&|();#" /* special outside of "str" */
                                 "$\"" IF_HUSH_TICK("`") /* always special */
                                 SPECIAL_VAR_SYMBOL_STR;
+#if defined(CMD_TEST2_SINGLEWORD_NOGLOB)
+                if (ctx.command->cmd_type == CMD_TEST2_SINGLEWORD_NOGLOB) {
+                        /* In [[ ]], {}<>&|() are not special */
+                        is_special += 8;
+                } else
+#endif
                 /* Are { and } special here? */
                 if (ctx.command->argv /* word [word]{... - non-special */
                  || ctx.word.length       /* word{... - non-special */
@@ -6953,7 +6970,7 @@ static char **expand_strvec_to_strvec(char **argv)
         return expand_variables(argv, EXP_FLAG_GLOB | EXP_FLAG_ESC_GLOB_CHARS);
 }
 
-#if defined(CMD_SINGLEWORD_NOGLOB)
+#if defined(CMD_SINGLEWORD_NOGLOB) || defined(CMD_TEST2_SINGLEWORD_NOGLOB)
 static char **expand_strvec_to_strvec_singleword_noglob(char **argv)
 {
         return expand_variables(argv, EXP_FLAG_SINGLEWORD);
@@ -8698,9 +8715,15 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                                  */
                                 if (WIFSIGNALED(status)) {
                                         int sig = WTERMSIG(status);
-                                        if (i == fg_pipe->num_cmds-1)
-                                                /* TODO: use strsignal() instead for bash compat? but that's bloat... */
-                                                puts(sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig));
+                                        if (G.run_list_level == 1
+                                        /* ^^^^^ Do not print in nested contexts, example:
+                                         * echo `sleep 1; sh -c 'kill -9 $$'` - prints "137", NOT "Killed 137"
+                                         */
+                                         && i == fg_pipe->num_cmds-1
+                                        ) {
+                                                /* strsignal() is for bash compat. ~600 bloat versus bbox's get_signame() */
+                                                puts(sig == SIGINT || sig == SIGPIPE ? "" : strsignal(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? */
@@ -9127,6 +9150,11 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 }
 
                 /* Expand the rest into (possibly) many strings each */
+#if defined(CMD_TEST2_SINGLEWORD_NOGLOB)
+                if (command->cmd_type == CMD_TEST2_SINGLEWORD_NOGLOB)
+                        argv_expanded = expand_strvec_to_strvec_singleword_noglob(argv + command->assignment_cnt);
+                else
+#endif
 #if defined(CMD_SINGLEWORD_NOGLOB)
                 if (command->cmd_type == CMD_SINGLEWORD_NOGLOB)
                         argv_expanded = expand_strvec_to_strvec_singleword_noglob(argv + command->assignment_cnt);
diff --git a/shell/hush_test/hush-bugs/strops5_bug.right b/shell/hush_test/hush-bugs/strops5_bug.right
new file mode 100644
index 000000000..aba7bb429
--- /dev/null
+++ b/shell/hush_test/hush-bugs/strops5_bug.right
@@ -0,0 +1,2 @@
+4:no:1
+5:YES:0
diff --git a/shell/hush_test/hush-bugs/strops5_bug.tests b/shell/hush_test/hush-bugs/strops5_bug.tests
new file mode 100755
index 000000000..3e24df768
--- /dev/null
+++ b/shell/hush_test/hush-bugs/strops5_bug.tests
@@ -0,0 +1,10 @@
+v='*.z'
+
+# Buggy:
+# the problem is that expansion rules of LHS and RHS of ~=
+# should not be the same: in RHS, "$v" and "*" should escape metas
+# (currently "$v" does not),
+# but in LHS, they should _not_ do that
+# (currently "*" does). Thus these cases fail:
+[[ a.z == "$v" ]]; echo 4:no:$? # BUG: "$v" expands to *.z
+[[ "*".z == ?.z ]]; echo 5:YES:$?       # BUG: "*" expands to \*
diff --git a/shell/hush_test/hush-misc/sig_exitcode.right b/shell/hush_test/hush-misc/sig_exitcode.right
index d5f000a08..7cbc1072d 100644
--- a/shell/hush_test/hush-misc/sig_exitcode.right
+++ b/shell/hush_test/hush-misc/sig_exitcode.right
@@ -1,5 +1,5 @@
-KILL
+Killed
 137:137
-KILL
+Killed
 0:0
 Done
diff --git a/shell/hush_test/hush-misc/wait7.right b/shell/hush_test/hush-misc/wait7.right
new file mode 100644
index 000000000..4b6445841
--- /dev/null
+++ b/shell/hush_test/hush-misc/wait7.right
@@ -0,0 +1,2 @@
+Background1
+Ok:0
diff --git a/shell/hush_test/hush-misc/wait7.tests b/shell/hush_test/hush-misc/wait7.tests
new file mode 100755
index 000000000..a54a778e5
--- /dev/null
+++ b/shell/hush_test/hush-misc/wait7.tests
@@ -0,0 +1,7 @@
+sleep 1 && echo "Background1" &
+pid=$!
+sleep 3 && echo "Background2: BUG!" &
+# Shouldn't wait for 2nd bkgd:
+wait $pid
+kill $!
+echo Ok:$?
diff --git a/shell/hush_test/hush-psubst/tick6.right b/shell/hush_test/hush-psubst/tick6.right
new file mode 100644
index 000000000..065fd3e79
--- /dev/null
+++ b/shell/hush_test/hush-psubst/tick6.right
@@ -0,0 +1 @@
+137
diff --git a/shell/hush_test/hush-psubst/tick6.tests b/shell/hush_test/hush-psubst/tick6.tests
new file mode 100755
index 000000000..33dd3630d
--- /dev/null
+++ b/shell/hush_test/hush-psubst/tick6.tests
@@ -0,0 +1 @@
+true; echo `sh -c 'kill -9 $$'` $?
diff --git a/shell/hush_test/hush-signals/catch.right b/shell/hush_test/hush-signals/catch.right
index 80a062c4b..68530c6e7 100644
--- a/shell/hush_test/hush-signals/catch.right
+++ b/shell/hush_test/hush-signals/catch.right
@@ -2,4 +2,4 @@ sending USR2
 caught
 sending USR2
 sending USR2
-USR2
+User defined signal 2
diff --git a/shell/hush_test/hush-signals/signal1.right b/shell/hush_test/hush-signals/signal1.right
new file mode 100644
index 000000000..cf403ac62
--- /dev/null
+++ b/shell/hush_test/hush-signals/signal1.right
@@ -0,0 +1,20 @@
+got signal
+trap -- 'echo got signal' USR1
+sent 1 signal
+got signal
+wait interrupted
+trap -- 'echo got signal' USR1
+sent 2 signal
+got signal
+wait interrupted
+trap -- 'echo got signal' USR1
+sent 3 signal
+got signal
+wait interrupted
+trap -- 'echo got signal' USR1
+sent 4 signal
+got signal
+wait interrupted
+trap -- 'echo got signal' USR1
+sent 5 signal
+sleep completed
diff --git a/shell/hush_test/hush-signals/signal1.tests b/shell/hush_test/hush-signals/signal1.tests
new file mode 100755
index 000000000..61943467a
--- /dev/null
+++ b/shell/hush_test/hush-signals/signal1.tests
@@ -0,0 +1,28 @@
+trap "echo got signal" USR1
+
+for try in 1 2 3 4 5; do
+    kill -USR1 $$
+    sleep 0.2
+    echo "sent $try signal"
+done &
+
+# Ensure "wait" has something to wait for
+sleep 2 &
+
+# Ensure we do not execute "trap" below before "kill -USR1" above
+# (was getting failure on loaded machine without this)
+sleep 0.1
+
+sleeping=true
+while $sleeping; do
+    trap
+    if wait %%; then
+        echo "sleep completed"
+        sleeping=false
+    elif [ $? = 127 ]; then
+        echo "BUG: no processes to wait for?!"
+        sleeping=false
+    else
+        echo "wait interrupted"
+    fi
+done
diff --git a/shell/hush_test/hush-signals/signal_read2.right b/shell/hush_test/hush-signals/signal_read2.right
index 71a6bc16d..87d8da304 100644
--- a/shell/hush_test/hush-signals/signal_read2.right
+++ b/shell/hush_test/hush-signals/signal_read2.right
@@ -1,2 +1,2 @@
-HUP
+Hangup
 Done:129
diff --git a/shell/hush_test/hush-signals/subshell.right b/shell/hush_test/hush-signals/subshell.right
index f865b932b..248fcc41a 100644
--- a/shell/hush_test/hush-signals/subshell.right
+++ b/shell/hush_test/hush-signals/subshell.right
@@ -17,5 +17,5 @@ Ok
 trap -- '' HUP
 trap -- '' QUIT
 trap -- '' SYS
-TERM
+Terminated
 Done
diff --git a/shell/hush_test/hush-test2/andor1.right b/shell/hush_test/hush-test2/andor1.right
new file mode 100644
index 000000000..038c7a681
--- /dev/null
+++ b/shell/hush_test/hush-test2/andor1.right
@@ -0,0 +1,6 @@
+1:YES
+2:no
+3:YES
+4:YES
+5:no
+6:no
diff --git a/shell/hush_test/hush-test2/andor1.tests b/shell/hush_test/hush-test2/andor1.tests
new file mode 100755
index 000000000..c449de7e6
--- /dev/null
+++ b/shell/hush_test/hush-test2/andor1.tests
@@ -0,0 +1,7 @@
+e=''
+[[ a && b ]]    && echo 1:YES
+[[ a && '' ]]   || echo 2:no
+[[ a || b ]]    && echo 3:YES
+[[ '' || b ]]   && echo 4:YES
+[[ "" || "$e" ]]        || echo 5:no
+[[ "" || $e ]]  || echo 6:no
diff --git a/shell/hush_test/hush-test2/noglob1.right b/shell/hush_test/hush-test2/noglob1.right
new file mode 100644
index 000000000..d0c3f1d8e
--- /dev/null
+++ b/shell/hush_test/hush-test2/noglob1.right
@@ -0,0 +1,2 @@
+1:YES:0
+2:YES:0
diff --git a/shell/hush_test/hush-test2/noglob1.tests b/shell/hush_test/hush-test2/noglob1.tests
new file mode 100755
index 000000000..963bacbd3
--- /dev/null
+++ b/shell/hush_test/hush-test2/noglob1.tests
@@ -0,0 +1,3 @@
+v='*.tests'
+[[ *.tests ]]; echo 1:YES:$?
+[[ $v ]]; echo 2:YES:$?
diff --git a/shell/hush_test/hush-test2/strops1.right b/shell/hush_test/hush-test2/strops1.right
new file mode 100644
index 000000000..590496301
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops1.right
@@ -0,0 +1,8 @@
+1:YES:0
+2:YES:0
+3:YES:0
+4:YES:0
+5:YES:0
+6:YES:0
+7:YES:0
+8:no:1
diff --git a/shell/hush_test/hush-test2/strops1.tests b/shell/hush_test/hush-test2/strops1.tests
new file mode 100755
index 000000000..bb24e2a2f
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops1.tests
@@ -0,0 +1,15 @@
+v='*.z'
+[[ a.z = *.z ]]; echo 1:YES:$?
+[[ a.z == $v ]]; echo 2:YES:$?
+
+# wildcards can match a slash
+[[ a/b = a*b ]]; echo 3:YES:$?
+[[ a/b == a?b ]]; echo 4:YES:$?
+
+# wildcards can match a leading dot
+[[ a/.b = a/*b ]]; echo 5:YES:$?
+[[ a/.b == a/?b ]]; echo 6:YES:$?
+
+# wildcards can be escaped
+[[ abc = a*c ]]; echo 7:YES:$?
+[[ abc == a\*c ]]; echo 8:no:$?
diff --git a/shell/hush_test/hush-test2/strops2.right b/shell/hush_test/hush-test2/strops2.right
new file mode 100644
index 000000000..8ddb4b0f0
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops2.right
@@ -0,0 +1,6 @@
+1:ERR2:2
+2:YES:0
+3:YES:0
+4:YES:0
+5:no:1
+6:YES:0
diff --git a/shell/hush_test/hush-test2/strops2.tests b/shell/hush_test/hush-test2/strops2.tests
new file mode 100755
index 000000000..ab325bc9f
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops2.tests
@@ -0,0 +1,12 @@
+# malformed regex
+[[ a =~ * ]]; echo 1:ERR2:$?
+
+[[ a/b =~ a.b ]]; echo 2:YES:$?
+[[ a/b =~ /*b ]]; echo 3:YES:$?
+
+v='[]b.-]'
+[[ a/.b] =~ $v ]]; echo 4:YES:$?
+
+v=']b.-'
+[[ a/.b] =~ $v ]]; echo 5:no:$?
+[[ a/.b] =~ [$v] ]]; echo 6:YES:$?
diff --git a/shell/hush_test/hush-test2/strops3.right b/shell/hush_test/hush-test2/strops3.right
new file mode 100644
index 000000000..14cc04fdc
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops3.right
@@ -0,0 +1,7 @@
+1:YES:0
+2:YES:0
+3:no:1
+4:YES:0
+2u:YES:0
+3u:YES:0
+4u:YES:0
diff --git a/shell/hush_test/hush-test2/strops3.tests b/shell/hush_test/hush-test2/strops3.tests
new file mode 100755
index 000000000..927476671
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops3.tests
@@ -0,0 +1,13 @@
+# regex should accept '+' operator
+[[ abcdef =~ a[b-z]+ ]]; echo 1:YES:$?
+
+# newline matches by "match any" patterns
+v='
+'
+[[ "$v" =~ . ]]; echo 2:YES:$?
+[[ "$v" =~ "[$v]" ]]; echo 3:no:$? # hmm bash does return 1... why?
+[[ "$v" =~ [^a] ]]; echo 4:YES:$?
+# should work even without quotes:
+[[ $v =~ . ]]; echo 2u:YES:$?
+[[ $v =~ [$v] ]]; echo 3u:YES:$?
+[[ $v =~ [^a] ]]; echo 4u:YES:$?
diff --git a/shell/hush_test/hush-test2/strops4.right b/shell/hush_test/hush-test2/strops4.right
new file mode 100644
index 000000000..53a176261
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops4.right
@@ -0,0 +1,2 @@
+1:no:1
+2:YES:0
diff --git a/shell/hush_test/hush-test2/strops4.tests b/shell/hush_test/hush-test2/strops4.tests
new file mode 100755
index 000000000..bb381426d
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops4.tests
@@ -0,0 +1,3 @@
+# < > are not redirect operators
+[[ a > b ]]; echo 1:no:$?
+[[ a < b ]]; echo 2:YES:$?
diff --git a/shell/hush_test/hush-test2/strops5.right b/shell/hush_test/hush-test2/strops5.right
new file mode 100644
index 000000000..9ed4d6569
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops5.right
@@ -0,0 +1,3 @@
+1:YES:0
+2:no:1
+3:YES:0
diff --git a/shell/hush_test/hush-test2/strops5.tests b/shell/hush_test/hush-test2/strops5.tests
new file mode 100755
index 000000000..ee01e5c30
--- /dev/null
+++ b/shell/hush_test/hush-test2/strops5.tests
@@ -0,0 +1,13 @@
+v='*.z'
+[[ a.z = *.z ]]; echo 1:YES:$?
+[[ a.z = "*".z ]]; echo 2:no:$?
+[[ a.z == $v ]]; echo 3:YES:$?
+
+# Buggy:
+# the problem is that expansion rules of LHS and RHS of ~=
+# should not be the same: in RHS, "$v" and "*" should escape metas
+# (currently "$v" does not),
+# but in LHS, they should _not_ do that
+# (currently "*" does). Thus these cases fail:
+#[[ a.z == "$v" ]]; echo 4:no:$?        # BUG: "$v" expands to *.z
+#[[ "*".z == ?.z ]]; echo 5:YES:$?      # BUG: "*" expands to \*
diff --git a/shell/math.c b/shell/math.c
index aac5017d0..2942cdd26 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -251,7 +251,7 @@ typedef struct remembered_name {
 } remembered_name;
 
 
-static arith_t FAST_FUNC
+static arith_t
 evaluate_string(arith_state_t *math_state, const char *expr);
 
 static const char*
@@ -582,7 +582,7 @@ static arith_t strto_arith_t(const char *nptr, char **endptr)
 # endif
 #endif
 
-static arith_t FAST_FUNC
+static arith_t
 evaluate_string(arith_state_t *math_state, const char *expr)
 {
         operator lasttok;