Merge branch 'busybox' into merge

6 files changed, 13 insertions, 6 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 52feff422..5870a23f3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2942,7 +2942,7 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #else
 # define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8))
 #endif
-static const uint16_t S_I_T[] = {
+static const uint16_t S_I_T[] ALIGN2 = {
 #if ENABLE_ASH_ALIAS
         SIT_ITEM(CSPCL   , CIGN     , CIGN , CIGN   ),    /* 0, PEOA */
 #endif
@@ -3044,7 +3044,7 @@ SIT(int c, int syntax)
 
 #else   /* !USE_SIT_FUNCTION */
 
-static const uint8_t syntax_index_table[] = {
+static const uint8_t syntax_index_table[] ALIGN1 = {
         /* BASESYNTAX_DQSYNTAX_SQSYNTAX_ARISYNTAX */
         /*   0      */ CWORD_CWORD_CWORD_CWORD,
         /*   1      */ CWORD_CWORD_CWORD_CWORD,
@@ -8320,7 +8320,7 @@ static char **nodeptr;
 #define EV_TESTED  02           /* exit status is checked; ignore -e flag */
 #define EV_BACKCMD 04           /* command executing within back quotes */
 
-static const uint8_t nodesize[N_NUMBER] = {
+static const uint8_t nodesize[N_NUMBER] ALIGN1 = {
         [NCMD     ] = SHELL_ALIGN(sizeof(struct ncmd)),
         [NPIPE    ] = SHELL_ALIGN(sizeof(struct npipe)),
         [NREDIR   ] = SHELL_ALIGN(sizeof(struct nredir)),
@@ -11935,7 +11935,7 @@ parsesub: {
          || (c != '(' && c != '{' && !is_name(c) && !is_special(c))
         ) {
 #if ENABLE_ASH_BASH_COMPAT
-                if (c == '\'')
+                if (syntax != DQSYNTAX && c == '\'')
                         bash_dollar_squote = 1;
                 else
 #endif
@@ -13072,7 +13072,8 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                 out1fmt("\n");
                                 col = 0;
                         }
-                        a += strlen(a) + 1;
+                        while (*a++ != '\0')
+                                continue;
                 }
         }
 # endif
diff --git a/shell/ash_test/ash-heredoc/heredoc4.right b/shell/ash_test/ash-heredoc/heredoc4.right
new file mode 100644
index 000000000..371b092e2
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc4.right
@@ -0,0 +1 @@
+'$'
diff --git a/shell/ash_test/ash-heredoc/heredoc4.tests b/shell/ash_test/ash-heredoc/heredoc4.tests
new file mode 100755
index 000000000..642ddb324
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc4.tests
@@ -0,0 +1,3 @@
+cat <<EOF
+'$'
+EOF
diff --git a/shell/ash_test/ash-quoting/dollar_squote_bash1.right b/shell/ash_test/ash-quoting/dollar_squote_bash1.right
index 57536b1d9..9f4e25efa 100644
--- a/shell/ash_test/ash-quoting/dollar_squote_bash1.right
+++ b/shell/ash_test/ash-quoting/dollar_squote_bash1.right
@@ -1,4 +1,5 @@
 a       b
+$'a\tb'
 a
 b c
 def
diff --git a/shell/ash_test/ash-quoting/dollar_squote_bash1.tests b/shell/ash_test/ash-quoting/dollar_squote_bash1.tests
index 93a56cac3..6fc411b93 100755
--- a/shell/ash_test/ash-quoting/dollar_squote_bash1.tests
+++ b/shell/ash_test/ash-quoting/dollar_squote_bash1.tests
@@ -1,4 +1,5 @@
 echo $'a\tb'
+echo "$'a\tb'"
 echo $'a\nb' $'c\nd''ef'
 echo $'a\'b' $'c\"d' $'e\\f'
 echo $'a\63b' $'c\063b' $'e\0633f'
diff --git a/shell/shell_common.c b/shell/shell_common.c
index dbd4286bf..c3bff477d 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -335,7 +335,7 @@ enum {
 };
 
 /* "-": treat args as parameters of option with ASCII code 1 */
-static const char ulimit_opt_string[] = "-HSa"
+static const char ulimit_opt_string[] ALIGN1 = "-HSa"
 #ifdef RLIMIT_FSIZE
                         "f::"
 #endif