Merge branch 'busybox' into merge

9 files changed, 275 insertions, 229 deletions

diff --git a/shell/Config.src b/shell/Config.src
index e4df35973..7f5f67050 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -5,34 +5,30 @@
 
 menu "Shells"
 
-INSERT
-
 
 choice
         prompt "Choose which shell is aliased to 'sh' name"
-        default FEATURE_SH_IS_ASH
+        default SH_IS_ASH
         help
           Choose which shell you want to be executed by 'sh' alias.
           The ash shell is the most bash compatible and full featured one.
 
 # note: cannot use "select ASH" here, it breaks "make allnoconfig"
-config FEATURE_SH_IS_ASH
-        depends on ASH
-        bool "ash"
+config SH_IS_ASH
         depends on !NOMMU
+        bool "ash"
 
-config FEATURE_SH_IS_HUSH
-        depends on HUSH
+config SH_IS_HUSH
         bool "hush"
 
-config FEATURE_SH_IS_NONE
+config SH_IS_NONE
         bool "none"
 
 endchoice
 
 choice
         prompt "Choose which shell is aliased to 'bash' name"
-        default FEATURE_BASH_IS_NONE
+        default BASH_IS_NONE
         help
           Choose which shell you want to be executed by 'bash' alias.
           The ash shell is the most bash compatible and full featured one.
@@ -47,32 +43,33 @@ choice
           can't be used for running them because it won't recongnize
           "bash" as a supported applet name.
 
-config FEATURE_BASH_IS_ASH
-        depends on ASH
-        bool "ash"
+config BASH_IS_ASH
         depends on !NOMMU
+        bool "ash"
 
-config FEATURE_BASH_IS_HUSH
-        depends on HUSH
+config BASH_IS_HUSH
         bool "hush"
 
-config FEATURE_BASH_IS_NONE
+config BASH_IS_NONE
         bool "none"
 
 endchoice
 
 
-config SH_MATH_SUPPORT
+INSERT
+
+
+config FEATURE_SH_MATH
         bool "POSIX math support"
         default y
-        depends on ASH || HUSH
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
           Enable math support in the shell via $((...)) syntax.
 
-config SH_MATH_SUPPORT_64
+config FEATURE_SH_MATH_64
         bool "Extend POSIX math support to 64 bit"
         default y
-        depends on SH_MATH_SUPPORT
+        depends on FEATURE_SH_MATH
         help
           Enable 64-bit math support in the shell. This will make the shell
           slightly larger, but will allow computation with very large numbers.
@@ -81,14 +78,14 @@ config SH_MATH_SUPPORT_64
 config FEATURE_SH_EXTRA_QUIET
         bool "Hide message on interactive shell startup"
         default y
-        depends on HUSH || ASH
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
           Remove the busybox introduction when starting a shell.
 
 config FEATURE_SH_STANDALONE
         bool "Standalone shell"
         default n
-        depends on (HUSH || ASH)
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
           This option causes busybox shells to use busybox applets
           in preference to executables in the PATH whenever possible. For
@@ -121,7 +118,7 @@ config FEATURE_SH_STANDALONE
 config FEATURE_SH_NOFORK
         bool "Run 'nofork' applets directly"
         default n
-        depends on (HUSH || ASH)
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
           This option causes busybox shells to not execute typical
           fork/exec/wait sequence, but call <applet>_main directly,
@@ -139,7 +136,7 @@ config FEATURE_SH_NOFORK
 config FEATURE_SH_HISTFILESIZE
         bool "Use $HISTFILESIZE"
         default y
-        depends on HUSH || ASH
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
           This option makes busybox shells to use $HISTFILESIZE variable
           to set shell history size. Note that its max value is capped
diff --git a/shell/Kbuild.src b/shell/Kbuild.src
index c00aec92a..6bba4989f 100644
--- a/shell/Kbuild.src
+++ b/shell/Kbuild.src
@@ -8,4 +8,4 @@ lib-y:=
 
 INSERT
 
-lib-$(CONFIG_SH_MATH_SUPPORT) += math.o
+lib-$(CONFIG_FEATURE_SH_MATH) += math.o
diff --git a/shell/ash.c b/shell/ash.c
index 2e7f68c05..35618937a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -30,80 +30,6 @@
  * - fake $PPID
  */
 
-/*
- * The following should be set to reflect the type of system you have:
- *      JOBS -> 1 if you have Berkeley job control, 0 otherwise.
- *      define SYSV if you are running under System V.
- *      define DEBUG=1 to compile in debugging ('set -o debug' to turn on)
- *      define DEBUG=2 to compile in and turn on debugging.
- *
- * When debugging is on (DEBUG is 1 and "set -o debug" was executed),
- * debugging info will be written to ./trace and a quit signal
- * will generate a core dump.
- */
-#define DEBUG 0
-/* Tweak debug output verbosity here */
-#define DEBUG_TIME 0
-#define DEBUG_PID 1
-#define DEBUG_SIG 1
-#define DEBUG_INTONOFF 0
-
-#define PROFILE 0
-
-#define JOBS ENABLE_ASH_JOB_CONTROL
-
-#include <setjmp.h>
-#include <fnmatch.h>
-#include <sys/times.h>
-#include <sys/utsname.h> /* for setting $HOSTNAME */
-
-#include "busybox.h" /* for applet_names */
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ <= 24
-/* Bionic at least up to version 24 has no glob() */
-# undef  ENABLE_ASH_INTERNAL_GLOB
-# define ENABLE_ASH_INTERNAL_GLOB 1
-#endif
-
-#if !ENABLE_ASH_INTERNAL_GLOB
-# include <glob.h>
-#endif
-
-#include "unicode.h"
-#include "shell_common.h"
-#if ENABLE_SH_MATH_SUPPORT
-# include "math.h"
-#endif
-#if ENABLE_ASH_RANDOM_SUPPORT
-# include "random.h"
-#else
-# define CLEAR_RANDOM_T(rnd) ((void)0)
-#endif
-
-#include "NUM_APPLETS.h"
-#if NUM_APPLETS == 1
-/* STANDALONE does not make sense, and won't compile */
-# undef CONFIG_FEATURE_SH_STANDALONE
-# undef ENABLE_FEATURE_SH_STANDALONE
-# undef IF_FEATURE_SH_STANDALONE
-# undef IF_NOT_FEATURE_SH_STANDALONE
-# define ENABLE_FEATURE_SH_STANDALONE 0
-# define IF_FEATURE_SH_STANDALONE(...)
-# define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__
-#endif
-
-#ifndef PIPE_BUF
-# define PIPE_BUF 4096           /* amount of buffering in a pipe */
-#endif
-
-#if !ENABLE_PLATFORM_MINGW32
-# define is_absolute_path(path) ((path)[0] == '/')
-#endif
-
-#if !BB_MMU
-# error "Do not even bother, ash will not run on NOMMU machine"
-#endif
-
 //config:config ASH
 //config:       bool "ash"
 //config:       default y
@@ -118,14 +44,14 @@
 //config:config ASH_OPTIMIZE_FOR_SIZE
 //config:       bool "Optimize for size instead of speed"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Compile ash for reduced size at the price of speed.
 //config:
 //config:config ASH_INTERNAL_GLOB
 //config:       bool "Use internal glob() implementation"
-//config:       default n
-//config:       depends on ASH
+//config:       default y       # Y is bigger, but because of uclibc glob() bug, let Y be default for now
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Do not use glob() function from libc, use internal implementation.
 //config:         Use this if you are getting "glob.h: No such file or directory"
@@ -134,7 +60,7 @@
 //config:config ASH_RANDOM_SUPPORT
 //config:       bool "Pseudorandom generator and $RANDOM variable"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable pseudorandom generator and dynamic variable "$RANDOM".
 //config:         Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -145,7 +71,7 @@
 //config:config ASH_EXPAND_PRMT
 //config:       bool "Expand prompt string"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         "PS#" may contain volatile content, such as backquote commands.
 //config:         This option recreates the prompt string from the environment
@@ -154,70 +80,70 @@
 //config:config ASH_BASH_COMPAT
 //config:       bool "bash-compatible extensions"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable bash-compatible extensions.
 //config:
 //config:config ASH_IDLE_TIMEOUT
 //config:       bool "Idle timeout variable"
 //config:       default n
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enables bash-like auto-logout after $TMOUT seconds of idle time.
 //config:
 //config:config ASH_JOB_CONTROL
 //config:       bool "Job control"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable job control in the ash shell.
 //config:
 //config:config ASH_ALIAS
 //config:       bool "Alias support"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable alias support in the ash shell.
 //config:
 //config:config ASH_GETOPTS
 //config:       bool "Builtin getopt to parse positional parameters"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable support for getopts builtin in ash.
 //config:
 //config:config ASH_BUILTIN_ECHO
 //config:       bool "Builtin version of 'echo'"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable support for echo builtin in ash.
 //config:
 //config:config ASH_BUILTIN_PRINTF
 //config:       bool "Builtin version of 'printf'"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable support for printf builtin in ash.
 //config:
 //config:config ASH_BUILTIN_TEST
 //config:       bool "Builtin version of 'test'"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable support for test builtin in ash.
 //config:
 //config:config ASH_HELP
 //config:       bool "help builtin"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable help builtin in ash.
 //config:
 //config:config ASH_CMDCMD
 //config:       bool "'command' command to override shell builtins"
 //config:       default y
-//config:       depends on ASH
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable support for the ash 'command' builtin, which allows
 //config:         you to run the specified command with the specified arguments,
@@ -225,19 +151,105 @@
 //config:
 //config:config ASH_MAIL
 //config:       bool "Check for new mail on interactive shells"
-//config:       default n
-//config:       depends on ASH
+//config:       default y
+//config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable "check for new mail" function in the ash shell.
-//config:
 
 //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
-//applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))
-//applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash))
+//applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
+//applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
 
 //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
+//kbuild:lib-$(CONFIG_SH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o
+//kbuild:lib-$(CONFIG_BASH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o
 //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
 
+/*
+ * The following should be set to reflect the type of system you have:
+ *      JOBS -> 1 if you have Berkeley job control, 0 otherwise.
+ *      define SYSV if you are running under System V.
+ *      define DEBUG=1 to compile in debugging ('set -o debug' to turn on)
+ *      define DEBUG=2 to compile in and turn on debugging.
+ *
+ * When debugging is on (DEBUG is 1 and "set -o debug" was executed),
+ * debugging info will be written to ./trace and a quit signal
+ * will generate a core dump.
+ */
+#define DEBUG 0
+/* Tweak debug output verbosity here */
+#define DEBUG_TIME 0
+#define DEBUG_PID 1
+#define DEBUG_SIG 1
+#define DEBUG_INTONOFF 0
+
+#define PROFILE 0
+
+#define JOBS ENABLE_ASH_JOB_CONTROL
+
+#include <setjmp.h>
+#include <fnmatch.h>
+#include <sys/times.h>
+#include <sys/utsname.h> /* for setting $HOSTNAME */
+
+#include "busybox.h" /* for applet_names */
+
+#if defined(__ANDROID_API__) && __ANDROID_API__ <= 24
+/* Bionic at least up to version 24 has no glob() */
+# undef  ENABLE_ASH_INTERNAL_GLOB
+# define ENABLE_ASH_INTERNAL_GLOB 1
+#endif
+
+#if !ENABLE_ASH_INTERNAL_GLOB && defined(__UCLIBC__)
+# error uClibc glob() is buggy, use ASH_INTERNAL_GLOB.
+# error The bug is: for "$PWD"/<pattern> ash will escape e.g. dashes in "$PWD"
+# error with backslash, even ones which do not need to be: "/a-b" -> "/a\-b"
+# error glob() should unbackslash them and match. uClibc does not unbackslash,
+# error fails to match dirname, subsequently not expanding <pattern> in it.
+// Testcase:
+// if (glob("/etc/polkit\\-1", 0, NULL, &pglob)) - this returns 0 on uclibc, no bug
+// if (glob("/etc/polkit\\-1/*", 0, NULL, &pglob)) printf("uclibc bug!\n");
+#endif
+
+#if !ENABLE_ASH_INTERNAL_GLOB
+# include <glob.h>
+#endif
+
+#include "unicode.h"
+#include "shell_common.h"
+#if ENABLE_FEATURE_SH_MATH
+# include "math.h"
+#endif
+#if ENABLE_ASH_RANDOM_SUPPORT
+# include "random.h"
+#else
+# define CLEAR_RANDOM_T(rnd) ((void)0)
+#endif
+
+#include "NUM_APPLETS.h"
+#if NUM_APPLETS == 1
+/* STANDALONE does not make sense, and won't compile */
+# undef CONFIG_FEATURE_SH_STANDALONE
+# undef ENABLE_FEATURE_SH_STANDALONE
+# undef IF_FEATURE_SH_STANDALONE
+# undef IF_NOT_FEATURE_SH_STANDALONE
+# define ENABLE_FEATURE_SH_STANDALONE 0
+# define IF_FEATURE_SH_STANDALONE(...)
+# define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__
+#endif
+
+#ifndef PIPE_BUF
+# define PIPE_BUF 4096           /* amount of buffering in a pipe */
+#endif
+
+#if !ENABLE_PLATFORM_MINGW32
+# define is_absolute_path(path) ((path)[0] == '/')
+#endif
+
+#if !BB_MMU
+# error "Do not even bother, ash will not run on NOMMU machine"
+#endif
+
 #if ENABLE_PLATFORM_MINGW32
 union node;
 struct strlist;
@@ -1343,6 +1355,8 @@ ash_msg_and_raise_error(const char *msg, ...)
 {
         va_list ap;
 
+        exitstatus = 2;
+
         va_start(ap, msg);
         ash_vmsg_and_raise(EXERROR, msg, ap);
         /* NOTREACHED */
@@ -2205,6 +2219,7 @@ lookupvar(const char *name)
         return NULL;
 }
 
+#if ENABLE_UNICODE_SUPPORT
 static void
 reinit_unicode_for_ash(void)
 {
@@ -2221,6 +2236,9 @@ reinit_unicode_for_ash(void)
                 reinit_unicode(s);
         }
 }
+#else
+# define reinit_unicode_for_ash() ((void)0)
+#endif
 
 /*
  * Search the environment of a builtin command.
@@ -2924,7 +2942,7 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
 #define USE_SIT_FUNCTION ENABLE_ASH_OPTIMIZE_FOR_SIZE
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 # define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8) | (d << 12))
 #else
 # define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8))
@@ -3305,7 +3323,18 @@ static const uint8_t syntax_index_table[] ALIGN1 = {
 # endif
 };
 
+#if 1
 # define SIT(c, syntax) ((S_I_T[syntax_index_table[c]] >> ((syntax)*4)) & 0xf)
+#else /* debug version, caught one signed char bug */
+# define SIT(c, syntax) \
+        ({ \
+                if ((c) < 0 || (c) > (PEOF + ENABLE_ASH_ALIAS)) \
+                        bb_error_msg_and_die("line:%d c:%d", __LINE__, (c)); \
+                if ((syntax) < 0 || (syntax) > (2 + ENABLE_FEATURE_SH_MATH)) \
+                        bb_error_msg_and_die("line:%d c:%d", __LINE__, (c)); \
+                ((S_I_T[syntax_index_table[c]] >> ((syntax)*4)) & 0xf); \
+        })
+#endif
 
 #endif  /* !USE_SIT_FUNCTION */
 
@@ -4765,7 +4794,7 @@ cmdputs(const char *s)
                 case CTLBACKQ:
                         str = "$(...)";
                         goto dostr;
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 case CTLARI:
                         str = "$((";
                         goto dostr;
@@ -5878,7 +5907,7 @@ redirectsafe(union node *redir, int flags)
  * We have to deal with backquotes, shell variables, and file metacharacters.
  */
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 static arith_t
 ash_arith(const char *s)
 {
@@ -5966,7 +5995,7 @@ static struct arglist exparg;
 /*
  * Our own itoa().
  */
-#if !ENABLE_SH_MATH_SUPPORT
+#if !ENABLE_FEATURE_SH_MATH
 /* cvtnum() is used even if math support is off (to prepare $? values and such) */
 typedef long arith_t;
 # define ARITH_FMT "%ld"
@@ -6220,14 +6249,15 @@ memtodest(const char *p, size_t len, int syntax, int quotes)
         do {
                 unsigned char c = *p++;
                 if (c) {
-                        int n = SIT(c, syntax);
-                        if ((quotes & QUOTES_ESC)
-                         && ((n == CCTL)
-                            ||  (((quotes & EXP_FULL) || syntax != BASESYNTAX)
-                                && n == CBACK)
-                                )
-                        ) {
-                                USTPUTC(CTLESC, q);
+                        if (quotes & QUOTES_ESC) {
+                                int n = SIT(c, syntax);
+                                if (n == CCTL
+                                 || (((quotes & EXP_FULL) || syntax != BASESYNTAX)
+                                     && n == CBACK
+                                    )
+                                ) {
+                                        USTPUTC(CTLESC, q);
+                                }
                         }
                 } else if (!(quotes & QUOTES_KEEPNUL))
                         continue;
@@ -6490,7 +6520,7 @@ expbackq(union node *cmd, int flag)
                 stackblock() + startloc));
 }
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 /*
  * Expand arithmetic expression.  Backup to start of expression,
  * evaluate, place result in (backed up) result, adjust string position.
@@ -6572,7 +6602,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                 CTLESC,
                 CTLVAR,
                 CTLBACKQ,
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 CTLENDARI,
 #endif
                 '\0'
@@ -6608,7 +6638,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                 c = p[length];
                 if (c) {
                         if (!(c & 0x80)
-                        IF_SH_MATH_SUPPORT(|| c == CTLENDARI)
+                        IF_FEATURE_SH_MATH(|| c == CTLENDARI)
                         ) {
                                 /* c == '=' || c == ':' || c == CTLENDARI */
                                 length++;
@@ -6688,7 +6718,7 @@ argstr(char *p, int flags, struct strlist *var_str_list)
                         expbackq(argbackq->n, flags | inquotes);
                         argbackq = argbackq->next;
                         goto start;
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 case CTLENDARI:
                         p--;
                         expari(flags | inquotes);
@@ -9686,7 +9716,7 @@ static int helpcmd(int, char **) FAST_FUNC;
 #if MAX_HISTORY
 static int historycmd(int, char **) FAST_FUNC;
 #endif
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 static int letcmd(int, char **) FAST_FUNC;
 #endif
 static int readcmd(int, char **) FAST_FUNC;
@@ -9766,7 +9796,7 @@ static const struct builtincmd builtintab[] = {
         { BUILTIN_REGULAR       "jobs"    , jobscmd    },
         { BUILTIN_REGULAR       "kill"    , killcmd    },
 #endif
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
         { BUILTIN_NOSPEC        "let"     , letcmd     },
 #endif
         { BUILTIN_ASSIGN        "local"   , localcmd   },
@@ -10004,11 +10034,13 @@ evalcommand(union node *cmd, int flags)
         }
 
         if (status) {
+ bail:
+                exitstatus = status;
+
                 /* We have a redirection error. */
                 if (spclbltin > 0)
                         raise_exception(EXERROR);
- bail:
-                exitstatus = status;
+
                 goto out;
         }
 
@@ -10516,7 +10548,7 @@ pgetc(void)
                 return g_parsefile->lastc[--g_parsefile->unget];
 
         if (--g_parsefile->left_in_line >= 0)
-                c = (signed char)*g_parsefile->next_to_pgetc++;
+                c = (unsigned char)*g_parsefile->next_to_pgetc++;
         else
                 c = preadbuffer();
 
@@ -11840,13 +11872,13 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         smallint quotef;
         smallint dblquote;
         smallint oldstyle;
-        smallint prevsyntax; /* syntax before arithmetic */
+        IF_FEATURE_SH_MATH(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 */
+        IF_FEATURE_SH_MATH(int arinest;)    /* levels of arithmetic expansion */
+        IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */
         int dqvarnest;       /* levels of variables expansion within double quotes */
 
         IF_ASH_BASH_COMPAT(smallint bash_dollar_squote = 0;)
@@ -11854,7 +11886,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         startlinno = g_parsefile->linno;
         bqlist = NULL;
         quotef = 0;
-        prevsyntax = 0;
+        IF_FEATURE_SH_MATH(prevsyntax = 0;)
 #if ENABLE_ASH_EXPAND_PRMT
         pssyntax = (syntax == PSSYNTAX);
         if (pssyntax)
@@ -11862,8 +11894,8 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
 #endif
         dblquote = (syntax == DQSYNTAX);
         varnest = 0;
-        arinest = 0;
-        parenlevel = 0;
+        IF_FEATURE_SH_MATH(arinest = 0;)
+        IF_FEATURE_SH_MATH(parenlevel = 0;)
         dqvarnest = 0;
 
         STARTSTACKSTR(out);
@@ -11970,7 +12002,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                         }
                         USTPUTC(c, out);
                         break;
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 case CLP:       /* '(' in arithmetic */
                         parenlevel++;
                         USTPUTC(c, out);
@@ -12021,7 +12053,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         } /* for (;;) */
  endword:
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
         if (syntax == ARISYNTAX)
                 raise_error_syntax("missing '))'");
 #endif
@@ -12200,7 +12232,7 @@ parsesub: {
         } else if (c == '(') {
                 /* $(command) or $((arith)) */
                 if (pgetc_eatbnl() == '(') {
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                         PARSEARITH();
 #else
                         raise_error_syntax("you disabled math support for $((arith)) syntax");
@@ -12455,7 +12487,7 @@ parsebackq: {
         goto parsebackq_newreturn;
 }
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 /*
  * Parse an arithmetic expansion (indicate start of one and set state)
  */
@@ -13532,7 +13564,7 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         return 0;
 }
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 /*
  * The let builtin. Partially stolen from GNU Bash, the Bourne Again SHell.
  * Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
@@ -13871,15 +13903,6 @@ init(void)
 //usage:#define ash_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
 
-//usage:#if ENABLE_FEATURE_SH_IS_ASH
-//usage:# define sh_trivial_usage ash_trivial_usage
-//usage:# define sh_full_usage    ash_full_usage
-//usage:#endif
-//usage:#if ENABLE_FEATURE_BASH_IS_ASH
-//usage:# define bash_trivial_usage ash_trivial_usage
-//usage:# define bash_full_usage    ash_full_usage
-//usage:#endif
-
 /*
  * Process the shell command line arguments.
  */
diff --git a/shell/ash_test/ash-misc/exitcode2.right b/shell/ash_test/ash-misc/exitcode2.right
new file mode 100644
index 000000000..f7cb983c6
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode2.right
@@ -0,0 +1,4 @@
+./test.sh: line 1: syntax error: unexpected ")"
+Done:2
+./exitcode2.tests: line 11: can't open does_not_exist: no such file
+Done:1
diff --git a/shell/ash_test/ash-misc/exitcode2.tests b/shell/ash_test/ash-misc/exitcode2.tests
new file mode 100755
index 000000000..79a6ebd50
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode2.tests
@@ -0,0 +1,12 @@
+# syntax error should return status 2
+cat >test.sh <<EOF
+)
+EOF
+chmod +x test.sh
+$THIS_SH ./test.sh
+echo Done:$?
+rm -f test.sh
+
+# redirection error with special builtin should return status 1
+(eval cat <does_not_exist)
+echo Done:$?
diff --git a/shell/hush.c b/shell/hush.c
index bcd4dffee..a56d3b280 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -82,35 +82,6 @@
  *              $ "export" i=`echo 'aaa  bbb'`; echo "$i"
  *              aaa
  */
-#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
-        || defined(__APPLE__) \
-    )
-# include <malloc.h>   /* for malloc_trim */
-#endif
-#include <glob.h>
-/* #include <dmalloc.h> */
-#if ENABLE_HUSH_CASE
-# include <fnmatch.h>
-#endif
-#include <sys/utsname.h> /* for setting $HOSTNAME */
-
-#include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
-#include "unicode.h"
-#include "shell_common.h"
-#include "math.h"
-#include "match.h"
-#if ENABLE_HUSH_RANDOM_SUPPORT
-# include "random.h"
-#else
-# define CLEAR_RANDOM_T(rnd) ((void)0)
-#endif
-#ifndef F_DUPFD_CLOEXEC
-# define F_DUPFD_CLOEXEC F_DUPFD
-#endif
-#ifndef PIPE_BUF
-# define PIPE_BUF 4096  /* amount of buffering in a pipe */
-#endif
-
 //config:config HUSH
 //config:       bool "hush"
 //config:       default y
@@ -128,7 +99,7 @@
 //config:config HUSH_BASH_COMPAT
 //config:       bool "bash-compatible extensions"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable bash-compatible extensions.
 //config:
@@ -142,14 +113,14 @@
 //config:config HUSH_HELP
 //config:       bool "help builtin"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable help builtin in hush. Code size + ~1 kbyte.
 //config:
 //config:config HUSH_INTERACTIVE
 //config:       bool "Interactive mode"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable interactive mode (prompt and command editing).
 //config:         Without this, hush simply reads and executes commands
@@ -177,35 +148,35 @@
 //config:config HUSH_TICK
 //config:       bool "Process substitution"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable process substitution `command` and $(command) in hush.
 //config:
 //config:config HUSH_IF
 //config:       bool "Support if/then/elif/else/fi"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable if/then/elif/else/fi in hush.
 //config:
 //config:config HUSH_LOOPS
 //config:       bool "Support for, while and until loops"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable for, while and until loops in hush.
 //config:
 //config:config HUSH_CASE
 //config:       bool "Support case ... esac statement"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable case ... esac statement in hush. +400 bytes.
 //config:
 //config:config HUSH_FUNCTIONS
 //config:       bool "Support funcname() { commands; } syntax"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable support for shell functions in hush. +800 bytes.
 //config:
@@ -219,7 +190,7 @@
 //config:config HUSH_RANDOM_SUPPORT
 //config:       bool "Pseudorandom generator and $RANDOM variable"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         Enable pseudorandom generator and dynamic variable "$RANDOM".
 //config:         Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -227,14 +198,14 @@
 //config:config HUSH_EXPORT_N
 //config:       bool "Support 'export -n' option"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         export -n unexports variables. It is a bash extension.
 //config:
 //config:config HUSH_MODE_X
 //config:       bool "Support 'hush -x' option and 'set -x' command"
 //config:       default y
-//config:       depends on HUSH
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
 //config:         This instructs hush to print commands before execution.
 //config:         Adds ~300 bytes.
@@ -245,14 +216,15 @@
 //config:       select HUSH
 //config:       help
 //config:         msh is deprecated and will be removed, please migrate to hush.
-//config:
 
 //applet:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP))
-//applet:IF_MSH(APPLET(msh, BB_DIR_BIN, BB_SUID_DROP))
-//applet:IF_FEATURE_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, sh))
-//applet:IF_FEATURE_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, bash))
+//applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
+//applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
+//applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
 
 //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o
+//kbuild:lib-$(CONFIG_SH_IS_HUSH) += hush.o match.o shell_common.o
+//kbuild:lib-$(CONFIG_BASH_IS_HUSH) += hush.o match.o shell_common.o
 //kbuild:lib-$(CONFIG_HUSH_RANDOM_SUPPORT) += random.o
 
 /* -i (interactive) and -s (read stdin) are also accepted,
@@ -265,17 +237,34 @@
 //usage:#define hush_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
 
-//usage:#define msh_trivial_usage hush_trivial_usage
-//usage:#define msh_full_usage hush_full_usage
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+        || defined(__APPLE__) \
+    )
+# include <malloc.h>   /* for malloc_trim */
+#endif
+#include <glob.h>
+/* #include <dmalloc.h> */
+#if ENABLE_HUSH_CASE
+# include <fnmatch.h>
+#endif
+#include <sys/utsname.h> /* for setting $HOSTNAME */
 
-//usage:#if ENABLE_FEATURE_SH_IS_HUSH
-//usage:# define sh_trivial_usage hush_trivial_usage
-//usage:# define sh_full_usage    hush_full_usage
-//usage:#endif
-//usage:#if ENABLE_FEATURE_BASH_IS_HUSH
-//usage:# define bash_trivial_usage hush_trivial_usage
-//usage:# define bash_full_usage    hush_full_usage
-//usage:#endif
+#include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
+#include "unicode.h"
+#include "shell_common.h"
+#include "math.h"
+#include "match.h"
+#if ENABLE_HUSH_RANDOM_SUPPORT
+# include "random.h"
+#else
+# define CLEAR_RANDOM_T(rnd) ((void)0)
+#endif
+#ifndef F_DUPFD_CLOEXEC
+# define F_DUPFD_CLOEXEC F_DUPFD
+#endif
+#ifndef PIPE_BUF
+# define PIPE_BUF 4096  /* amount of buffering in a pipe */
+#endif
 
 
 /* Build knobs */
@@ -1148,6 +1137,9 @@ static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch)
         char msg[2];
         msg[0] = ch;
         msg[1] = '\0';
+#if HUSH_DEBUG >= 2
+        bb_error_msg("hush.c:%u", lineno);
+#endif
         bb_error_msg("syntax error: unexpected %s", ch == EOF ? "EOF" : msg);
 }
 
@@ -1574,9 +1566,8 @@ static sighandler_t install_sighandler(int sig, sighandler_t handler)
 }
 
 static void hush_exit(int exitcode) NORETURN;
-static void fflush_and__exit(void) NORETURN;
-static void restore_ttypgrp_and__exit(void) NORETURN;
 
+static void restore_ttypgrp_and__exit(void) NORETURN;
 static void restore_ttypgrp_and__exit(void)
 {
         /* xfunc has failed! die die die */
@@ -1585,6 +1576,8 @@ static void restore_ttypgrp_and__exit(void)
         hush_exit(xfunc_error_retval);
 }
 
+#if ENABLE_HUSH_JOB
+
 /* Needed only on some libc:
  * It was observed that on exit(), fgetc'ed buffered data
  * gets "unwound" via lseek(fd, -NUM, SEEK_CUR).
@@ -1598,14 +1591,13 @@ static void restore_ttypgrp_and__exit(void)
  * and in `cmd` handling.
  * If set as die_func(), this makes xfunc_die() exit via _exit(), not exit():
  */
+static void fflush_and__exit(void) NORETURN;
 static void fflush_and__exit(void)
 {
         fflush_all();
         _exit(xfunc_error_retval);
 }
 
-#if ENABLE_HUSH_JOB
-
 /* After [v]fork, in child: do not restore tty pgrp on xfunc death */
 # define disable_restore_tty_pgrp_on_exit() (die_func = fflush_and__exit)
 /* After [v]fork, in parent: restore tty pgrp on xfunc death */
@@ -4011,7 +4003,7 @@ static int i_peek_and_eat_bkslash_nl(struct in_str *input)
         }
 }
 
-#if ENABLE_HUSH_TICK || ENABLE_SH_MATH_SUPPORT || ENABLE_HUSH_DOLLAR_OPS
+#if ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS
 /* Subroutines for copying $(...) and `...` things */
 static int add_till_backquote(o_string *dest, struct in_str *input, int in_dquote);
 /* '...' */
@@ -4179,7 +4171,7 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign
         }
         return ch;
 }
-#endif /* ENABLE_HUSH_TICK || ENABLE_SH_MATH_SUPPORT || ENABLE_HUSH_DOLLAR_OPS */
+#endif /* ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS */
 
 /* Return code: 0 for OK, 1 for syntax error */
 #if BB_MMU
@@ -4333,13 +4325,13 @@ static int parse_dollar(o_string *as_string,
                 o_addchr(dest, SPECIAL_VAR_SYMBOL);
                 break;
         }
-#if ENABLE_SH_MATH_SUPPORT || ENABLE_HUSH_TICK
+#if ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_TICK
         case '(': {
                 unsigned pos;
 
                 ch = i_getch(input);
                 nommu_addchr(as_string, ch);
-# if ENABLE_SH_MATH_SUPPORT
+# if ENABLE_FEATURE_SH_MATH
                 if (i_peek_and_eat_bkslash_nl(input) == '(') {
                         ch = i_getch(input);
                         nommu_addchr(as_string, ch);
@@ -5008,7 +5000,8 @@ static struct pipe *parse_stream(char **pstring,
                          * if we see {, we call parse_group(..., end_trigger='}')
                          * and it will match } earlier (not here). */
                         syntax_error_unexpected_ch(ch);
-                        goto parse_error;
+                        G.last_exitcode = 2;
+                        goto parse_error1;
                 default:
                         if (HUSH_DEBUG)
                                 bb_error_msg_and_die("BUG: unexpected %c\n", ch);
@@ -5016,6 +5009,8 @@ static struct pipe *parse_stream(char **pstring,
         } /* while (1) */
 
  parse_error:
+        G.last_exitcode = 1;
+ parse_error1:
         {
                 struct parse_context *pctx;
                 IF_HAS_KEYWORDS(struct parse_context *p2;)
@@ -5049,7 +5044,6 @@ static struct pipe *parse_stream(char **pstring,
                 } while (HAS_KEYWORDS && pctx);
 
                 o_free(&dest);
-                G.last_exitcode = 1;
 #if !BB_MMU
                 if (pstring)
                         *pstring = NULL;
@@ -5217,7 +5211,7 @@ static char *encode_then_expand_string(const char *str, int process_bkslash, int
         return exp_str;
 }
 
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
 static arith_t expand_and_evaluate_arith(const char *arg, const char **errmsg_p)
 {
         arith_state_t math_state;
@@ -5469,7 +5463,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                 }
 #endif
                 else if (exp_op == ':') {
-#if ENABLE_HUSH_BASH_COMPAT && ENABLE_SH_MATH_SUPPORT
+#if ENABLE_HUSH_BASH_COMPAT && ENABLE_FEATURE_SH_MATH
                         /* It's ${var:N[:M]} bashism.
                          * Note that in encoded form it has TWO parts:
                          * var:N<SPECIAL_VAR_SYMBOL>M<SPECIAL_VAR_SYMBOL>
@@ -5604,7 +5598,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
 #if ENABLE_HUSH_TICK
                 o_string subst_result = NULL_O_STRING;
 #endif
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 char arith_buf[sizeof(arith_t)*3 + 2];
 #endif
 
@@ -5698,7 +5692,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                         val = subst_result.data;
                         goto store_val;
 #endif
-#if ENABLE_SH_MATH_SUPPORT
+#if ENABLE_FEATURE_SH_MATH
                 case '+': { /* <SPECIAL_VAR_SYMBOL>+cmd<SPECIAL_VAR_SYMBOL> */
                         arith_t res;
 
diff --git a/shell/hush_test/hush-misc/exitcode2.right b/shell/hush_test/hush-misc/exitcode2.right
new file mode 100644
index 000000000..0a57b9b1b
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode2.right
@@ -0,0 +1,4 @@
+hush: syntax error: unexpected )
+Done:2
+hush: can't open 'does_not_exist': No such file or directory
+Done:1
diff --git a/shell/hush_test/hush-misc/exitcode2.tests b/shell/hush_test/hush-misc/exitcode2.tests
new file mode 100755
index 000000000..79a6ebd50
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode2.tests
@@ -0,0 +1,12 @@
+# syntax error should return status 2
+cat >test.sh <<EOF
+)
+EOF
+chmod +x test.sh
+$THIS_SH ./test.sh
+echo Done:$?
+rm -f test.sh
+
+# redirection error with special builtin should return status 1
+(eval cat <does_not_exist)
+echo Done:$?
diff --git a/shell/math.h b/shell/math.h
index 864bee691..32e1ffe35 100644
--- a/shell/math.h
+++ b/shell/math.h
@@ -63,7 +63,7 @@
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-#if ENABLE_SH_MATH_SUPPORT_64
+#if ENABLE_FEATURE_SH_MATH_64
 typedef long long arith_t;
 #define ARITH_FMT "%lld"
 #define strto_arith_t strtoull