Merge branch 'busybox' into merge

24 files changed, 248 insertions, 20 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 28f74e8a8..c9eaaf52a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7855,7 +7855,7 @@ subevalvar(char *start, char *str, int strloc,
                 while (idx <= end) {
  try_to_match:
                         if (no_meta_len == 0) {
-                                /* pattern has meta chars, have to glob; or ENABLE_ASH_OPTIMIZE_FOR_SIZE  */
+                                /* pattern has meta chars, have to glob; or ENABLE_ASH_OPTIMIZE_FOR_SIZE */
                                 loc = scanright(idx, rmesc, rmescend, str, quotes, /*match_at_start:*/ 1);
                         } else {
                                 /* Testcase for very slow replace (performs about 22k replaces):
@@ -7863,16 +7863,19 @@ subevalvar(char *start, char *str, int strloc,
                                  * x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;echo ${#x}
                                  * echo "${x//:/|}"
                                  */
-                                size_t n;
                                 if (strncmp(rmesc, str, no_meta_len) != 0)
                                         goto no_match;
-                                n = no_meta_len;
                                 loc = idx;
-                                do {
-                                        if (quotes && (unsigned char)*loc == CTLESC)
+                                if (!quotes) {
+                                        loc += no_meta_len;
+                                } else {
+                                        size_t n = no_meta_len;
+                                        do {
+                                                if ((unsigned char)*loc == CTLESC)
+                                                        loc++;
                                                 loc++;
-                                        loc++;
-                                } while (--n != 0);
+                                        } while (--n != 0);
+                                }
                         }
                         //bb_error_msg("scanright('%s'):'%s'", str, loc);
                         if (!loc) {
diff --git a/shell/ash_test/ash-psubst/falsetick.right b/shell/ash_test/ash-psubst/falsetick.right
new file mode 100644
index 000000000..0335254a8
--- /dev/null
+++ b/shell/ash_test/ash-psubst/falsetick.right
@@ -0,0 +1,24 @@
+0
+0
+0
+0
+2
+2
+2
+2
+./falsetick.tests: line 12: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 13: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 14: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 15: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 16: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 17: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 18: can't create /does/not/exist: nonexistent directory
+1
+./falsetick.tests: line 19: can't create /does/not/exist: nonexistent directory
+1
diff --git a/shell/ash_test/ash-psubst/falsetick.tests b/shell/ash_test/ash-psubst/falsetick.tests
new file mode 100755
index 000000000..d2b93695e
--- /dev/null
+++ b/shell/ash_test/ash-psubst/falsetick.tests
@@ -0,0 +1,19 @@
+# Exitcode 0 (`` has no exitcode, but assignment has):
+true;  a=``; echo $?
+false; a=``; echo $?
+true;  a=$(); echo $?
+false; a=$(); echo $?
+# Exitcode 2 (`cmd` expansion sets exitcode after assignment set it to 0):
+true;  a=`exit 2`; echo $?
+false; a=`exit 2`; echo $?
+true;  a=$(exit 2); echo $?
+false; a=$(exit 2); echo $?
+# Exitcode 1 (redirect sets exitcode to 1 on error after them):
+true;  a=`` >/does/not/exist; echo $?
+false; a=`` >/does/not/exist; echo $?
+true;  a=$() >/does/not/exist; echo $?
+false; a=$() >/does/not/exist; echo $?
+true;  a=`exit 2` >/does/not/exist; echo $?
+false; a=`exit 2` >/does/not/exist; echo $?
+true;  a=$(exit 2) >/does/not/exist; echo $?
+false; a=$(exit 2) >/does/not/exist; echo $?
diff --git a/shell/ash_test/ash-psubst/falsetick2.right b/shell/ash_test/ash-psubst/falsetick2.right
new file mode 100644
index 000000000..670f560f1
--- /dev/null
+++ b/shell/ash_test/ash-psubst/falsetick2.right
@@ -0,0 +1 @@
+Two:2 v:[]
diff --git a/shell/ash_test/ash-psubst/falsetick2.tests b/shell/ash_test/ash-psubst/falsetick2.tests
new file mode 100755
index 000000000..cfbd1a5de
--- /dev/null
+++ b/shell/ash_test/ash-psubst/falsetick2.tests
@@ -0,0 +1,3 @@
+v=v
+v=`exit 2` `false`
+echo Two:$? v:"[$v]"
diff --git a/shell/ash_test/ash-vars/var6.right b/shell/ash_test/ash-vars/var6.right
new file mode 100644
index 000000000..b37417fa1
--- /dev/null
+++ b/shell/ash_test/ash-vars/var6.right
@@ -0,0 +1,2 @@
+SHELL: line 1: syntax error: bad substitution
+SHELL: line 1: syntax error: bad substitution
diff --git a/shell/ash_test/ash-vars/var6.tests b/shell/ash_test/ash-vars/var6.tests
new file mode 100755
index 000000000..626e60ee1
--- /dev/null
+++ b/shell/ash_test/ash-vars/var6.tests
@@ -0,0 +1,5 @@
+# reject invalid vars
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+"$THIS_SH" -c 'echo ${1q}' SHELL
+"$THIS_SH" -c 'echo ${&}' SHELL
+#"$THIS_SH" -c 'echo ${$}' SHELL -- this is valid as it's the same as $$
diff --git a/shell/ash_test/ash-vars/var_nested1.right b/shell/ash_test/ash-vars/var_nested1.right
new file mode 100644
index 000000000..f4bc5f4b6
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_nested1.right
@@ -0,0 +1,3 @@
+Expected:AB Actual:AB
+Expected:Ab Actual:Ab
+Expected:ab Actual:ab
diff --git a/shell/ash_test/ash-vars/var_nested1.tests b/shell/ash_test/ash-vars/var_nested1.tests
new file mode 100755
index 000000000..59e4a14fa
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_nested1.tests
@@ -0,0 +1,16 @@
+f() { a=A; b=B; }
+
+a=a
+b=b
+f
+echo Expected:AB Actual:$a$b
+
+a=a
+b=b
+b= f
+echo Expected:Ab Actual:$a$b
+
+a=a
+b=b
+a= b= f
+echo Expected:ab Actual:$a$b
diff --git a/shell/ash_test/ash-vars/var_nested2.right b/shell/ash_test/ash-vars/var_nested2.right
new file mode 100644
index 000000000..c930d971c
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_nested2.right
@@ -0,0 +1 @@
+aB
diff --git a/shell/ash_test/ash-vars/var_nested2.tests b/shell/ash_test/ash-vars/var_nested2.tests
new file mode 100755
index 000000000..e8865861e
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_nested2.tests
@@ -0,0 +1,2 @@
+# the bug was easier to trigger in one-liner form
+a=a; b=b; f() { a=A; b=B; }; a= f; echo $a$b
diff --git a/shell/hush.c b/shell/hush.c
index 1aa0a400d..27092c12f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -384,6 +384,7 @@
 #define BASH_PATTERN_SUBST ENABLE_HUSH_BASH_COMPAT
 #define BASH_SUBSTR        ENABLE_HUSH_BASH_COMPAT
 #define BASH_SOURCE        ENABLE_HUSH_BASH_COMPAT
+#define BASH_DOLLAR_SQUOTE ENABLE_HUSH_BASH_COMPAT
 #define BASH_HOSTNAME_VAR  ENABLE_HUSH_BASH_COMPAT
 #define BASH_EPOCH_VARS    ENABLE_HUSH_BASH_COMPAT
 #define BASH_TEST2         (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
@@ -4919,6 +4920,101 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign
 }
 #endif /* ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS */
 
+#if BASH_DOLLAR_SQUOTE
+/* Return code: 1 for "found and parsed", 0 for "seen something else" */
+# if BB_MMU
+#define parse_dollar_squote(as_string, dest, input) \
+        parse_dollar_squote(dest, input)
+#define as_string NULL
+# endif
+static int parse_dollar_squote(o_string *as_string, o_string *dest, struct in_str *input)
+{
+        int start;
+        int ch = i_peek_and_eat_bkslash_nl(input);  /* first character after the $ */
+        debug_printf_parse("parse_dollar_squote entered: ch='%c'\n", ch);
+        if (ch != '\'')
+                return 0;
+
+        dest->has_quoted_part = 1;
+        start = dest->length;
+
+        ch = i_getch(input); /* eat ' */
+        nommu_addchr(as_string, ch);
+        while (1) {
+                ch = i_getch(input);
+                nommu_addchr(as_string, ch);
+                if (ch == EOF) {
+                        syntax_error_unterm_ch('\'');
+                        return 0;
+                }
+                if (ch == '\'')
+                        break;
+                if (ch == SPECIAL_VAR_SYMBOL) {
+                        /* Convert raw ^C to corresponding special variable reference */
+                        o_addchr(dest, SPECIAL_VAR_SYMBOL);
+                        o_addchr(dest, SPECIAL_VAR_QUOTED_SVS);
+                        /* will addchr() another SPECIAL_VAR_SYMBOL (see after the if() block) */
+                } else if (ch == '\\') {
+                        static const char C_escapes[] ALIGN1 = "nrbtfav""x\\01234567";
+
+                        ch = i_getch(input);
+                        nommu_addchr(as_string, ch);
+                        if (strchr(C_escapes, ch)) {
+                                char buf[4];
+                                char *p = buf;
+                                int cnt = 2;
+
+                                buf[0] = ch;
+                                if ((unsigned char)(ch - '0') <= 7) { /* \ooo */
+                                        do {
+                                                ch = i_peek(input);
+                                                if ((unsigned char)(ch - '0') > 7)
+                                                        break;
+                                                *++p = ch = i_getch(input);
+                                                nommu_addchr(as_string, ch);
+                                        } while (--cnt != 0);
+                                } else if (ch == 'x') { /* \xHH */
+                                        do {
+                                                ch = i_peek(input);
+                                                if (!isxdigit(ch))
+                                                        break;
+                                                *++p = ch = i_getch(input);
+                                                nommu_addchr(as_string, ch);
+                                        } while (--cnt != 0);
+                                        if (cnt == 2) { /* \x but next char is "bad" */
+                                                ch = 'x';
+                                                goto unrecognized;
+                                        }
+                                } /* else simple seq like \\ or \t */
+                                *++p = '\0';
+                                p = buf;
+                                ch = bb_process_escape_sequence((void*)&p);
+                                //bb_error_msg("buf:'%s' ch:%x", buf, ch);
+                                if (ch == '\0')
+                                        continue; /* bash compat: $'...\0...' emits nothing */
+                        } else { /* unrecognized "\z": encode both chars unless ' or " */
+                                if (ch != '\'' && ch != '"') {
+ unrecognized:
+                                        o_addqchr(dest, '\\');
+                                }
+                        }
+                } /* if (\...) */
+                o_addqchr(dest, ch);
+        }
+
+        if (dest->length == start) {
+                /* $'', $'\0', $'\000\x00' and the like */
+                o_addchr(dest, SPECIAL_VAR_SYMBOL);
+                o_addchr(dest, SPECIAL_VAR_SYMBOL);
+        }
+
+        return 1;
+# undef as_string
+}
+#else
+# define parse_dollar_squote(as_string, dest, input) 0
+#endif /* BASH_DOLLAR_SQUOTE */
+
 /* Return code: 0 for OK, 1 for syntax error */
 #if BB_MMU
 #define parse_dollar(as_string, dest, input, quote_mask) \
@@ -4931,7 +5027,7 @@ static int parse_dollar(o_string *as_string,
 {
         int ch = i_peek_and_eat_bkslash_nl(input);  /* first character after the $ */
 
-        debug_printf_parse("parse_dollar entered: ch='%c'\n", ch);
+        debug_printf_parse("parse_dollar entered: ch='%c' quote_mask:0x%x\n", ch, quote_mask);
         if (isalpha(ch)) {
  make_var:
                 ch = i_getch(input);
@@ -5247,6 +5343,8 @@ static int encode_string(o_string *as_string,
                 goto again;
         }
         if (ch == '$') {
+                //if (parse_dollar_squote(as_string, dest, input))
+                //      goto again;
                 if (!parse_dollar(as_string, dest, input, /*quote_mask:*/ 0x80)) {
                         debug_printf_parse("encode_string return 0: "
                                         "parse_dollar returned 0 (error)\n");
@@ -5723,6 +5821,8 @@ static struct pipe *parse_stream(char **pstring,
                         o_addchr(&ctx.word, ch);
                         continue; /* get next char */
                 case '$':
+                        if (parse_dollar_squote(&ctx.as_string, &ctx.word, input))
+                                continue; /* get next char */
                         if (!parse_dollar(&ctx.as_string, &ctx.word, input, /*quote_mask:*/ 0)) {
                                 debug_printf_parse("parse_stream parse error: "
                                         "parse_dollar returned 0 (error)\n");
@@ -5850,7 +5950,6 @@ static struct pipe *parse_stream(char **pstring,
                         if (ctx.ctx_res_w == RES_MATCH)
                                 goto case_semi;
 #endif
-
                 case '}':
                         /* proper use of this character is caught by end_trigger:
                          * if we see {, we call parse_group(..., end_trigger='}')
@@ -6166,6 +6265,8 @@ static char *encode_then_expand_vararg(const char *str, int handle_squotes, int
                         continue;
                 }
                 if (ch == '$') {
+                        if (parse_dollar_squote(NULL, &dest, &input))
+                                continue;
                         if (!parse_dollar(NULL, &dest, &input, /*quote_mask:*/ 0x80)) {
                                 debug_printf_parse("%s: error: parse_dollar returned 0 (error)\n", __func__);
                                 goto ret;
@@ -6365,6 +6466,18 @@ static arith_t expand_and_evaluate_arith(const char *arg, const char **errmsg_p)
 /* ${var/[/]pattern[/repl]} helpers */
 static char *strstr_pattern(char *val, const char *pattern, int *size)
 {
+        int sz = strcspn(pattern, "*?[\\");
+        if (pattern[sz] == '\0') {
+                /* Optimization for trivial patterns.
+                 * Testcase for very slow replace (performs about 22k replaces):
+                 * x=::::::::::::::::::::::
+                 * x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;echo ${#x}
+                 * echo "${x//:/|}"
+                 */
+                *size = sz;
+                return strstr(val, pattern);
+        }
+
         while (1) {
                 char *end = scan_and_match(val, pattern, SCAN_MOVE_FROM_RIGHT + SCAN_MATCH_LEFT_HALF);
                 debug_printf_varexp("val:'%s' pattern:'%s' end:'%s'\n", val, pattern, end);
diff --git a/shell/hush_test/hush-psubst/falsetick.right b/shell/hush_test/hush-psubst/falsetick.right
index 0b98fb778..d2d1a2880 100644
--- a/shell/hush_test/hush-psubst/falsetick.right
+++ b/shell/hush_test/hush-psubst/falsetick.right
@@ -22,6 +22,3 @@ hush: can't open '/does/not/exist': No such file or directory
 1
 hush: can't open '/does/not/exist': No such file or directory
 1
-hush: can't open '/does/not/exist': No such file or directory
-1
-Done: a=b
diff --git a/shell/hush_test/hush-psubst/falsetick.tests b/shell/hush_test/hush-psubst/falsetick.tests
index 44d2eae8b..d2b93695e 100755
--- a/shell/hush_test/hush-psubst/falsetick.tests
+++ b/shell/hush_test/hush-psubst/falsetick.tests
@@ -17,6 +17,3 @@ true;  a=`exit 2` >/does/not/exist; echo $?
 false; a=`exit 2` >/does/not/exist; echo $?
 true;  a=$(exit 2) >/does/not/exist; echo $?
 false; a=$(exit 2) >/does/not/exist; echo $?
-# ...and assignment still happens despite redirect error:
-true;  a=$(echo b) >/does/not/exist; echo $?
-echo "Done: a=$a"
diff --git a/shell/hush_test/hush-psubst/falsetick3.right b/shell/hush_test/hush-psubst/falsetick3.right
new file mode 100644
index 000000000..327849a31
--- /dev/null
+++ b/shell/hush_test/hush-psubst/falsetick3.right
@@ -0,0 +1,3 @@
+hush: can't open '/does/not/exist': No such file or directory
+1
+Done: a=b
diff --git a/shell/hush_test/hush-psubst/falsetick3.tests b/shell/hush_test/hush-psubst/falsetick3.tests
new file mode 100755
index 000000000..cd185335e
--- /dev/null
+++ b/shell/hush_test/hush-psubst/falsetick3.tests
@@ -0,0 +1,3 @@
+# assignment still happens despite redirect error
+true;  a=$(echo b) >/does/not/exist; echo $?
+echo "Done: a=$a"
diff --git a/shell/hush_test/hush-quoting/dollar_squote_bash1.right b/shell/hush_test/hush-quoting/dollar_squote_bash1.right
new file mode 100644
index 000000000..9f4e25efa
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_squote_bash1.right
@@ -0,0 +1,10 @@
+a       b
+$'a\tb'
+a
+b c
+def
+a'b c"d e\f
+a3b c3b e33f
+a\80b c08b
+a3b c30b
+x       y
diff --git a/shell/hush_test/hush-quoting/dollar_squote_bash1.tests b/shell/hush_test/hush-quoting/dollar_squote_bash1.tests
new file mode 100755
index 000000000..6fc411b93
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_squote_bash1.tests
@@ -0,0 +1,8 @@
+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'
+echo $'a\80b' $'c\608b'
+echo $'a\x33b' $'c\x330b'
+echo $'x\x9y'
diff --git a/shell/hush_test/hush-quoting/dollar_squote_bash2.right b/shell/hush_test/hush-quoting/dollar_squote_bash2.right
new file mode 100644
index 000000000..f7a1731dd
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_squote_bash2.right
@@ -0,0 +1,6 @@
+strstrstrstrstrstrstrstrstrstrstrstrstrstrstrstrstr
+strstrstrstrstrstrstrstrstrstrstrstrstrstrstrstrstr
+80:\�
+81:\�
+82:\�
+Done:0
diff --git a/shell/hush_test/hush-quoting/dollar_squote_bash2.tests b/shell/hush_test/hush-quoting/dollar_squote_bash2.tests
new file mode 100755
index 000000000..449772813
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_squote_bash2.tests
@@ -0,0 +1,10 @@
+# Embedded NULs
+echo $'str\x00'strstrstrstrstrstrstrstrstrstrstrstrstrstrstrstr
+echo $'str\000'strstrstrstrstrstrstrstrstrstrstrstrstrstrstrstr
+
+# The chars after '\' are hex 0x80,81,82...
+echo 80:$'\�'
+echo 81:$'\�'
+echo 82:$'\�'
+
+echo Done:$?
diff --git a/shell/hush_test/hush-vars/var6.tests b/shell/hush_test/hush-vars/var6.tests
index aea36d62d..626e60ee1 100755
--- a/shell/hush_test/hush-vars/var6.tests
+++ b/shell/hush_test/hush-vars/var6.tests
@@ -1,4 +1,5 @@
 # reject invalid vars
-"$THIS_SH" -c 'echo ${1q}'
-"$THIS_SH" -c 'echo ${&}'
-#"$THIS_SH" -c 'echo ${$}' -- this is valid as it's the same as $$
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+"$THIS_SH" -c 'echo ${1q}' SHELL
+"$THIS_SH" -c 'echo ${&}' SHELL
+#"$THIS_SH" -c 'echo ${$}' SHELL -- this is valid as it's the same as $$
diff --git a/shell/hush_test/hush-vars/var_bash7.right b/shell/hush_test/hush-vars/var_bash7.right
new file mode 100644
index 000000000..223b7836f
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash7.right
@@ -0,0 +1 @@
+B
diff --git a/shell/hush_test/hush-vars/var_bash7.tests b/shell/hush_test/hush-vars/var_bash7.tests
new file mode 100755
index 000000000..c4ce03f7f
--- /dev/null
+++ b/shell/hush_test/hush-vars/var_bash7.tests
@@ -0,0 +1 @@
+x=AB; echo "${x#$'\x41'}"
diff --git a/shell/match.c b/shell/match.c
index ee8abb2db..90f77546d 100644
--- a/shell/match.c
+++ b/shell/match.c
@@ -64,11 +64,10 @@ char* FAST_FUNC scan_and_match(char *string, const char *pattern, unsigned flags
         }
 
         while (loc != end) {
-                char c;
                 int r;
 
-                c = *loc;
                 if (flags & SCAN_MATCH_LEFT_HALF) {
+                        char c = *loc;
                         *loc = '\0';
                         r = fnmatch(pattern, string, 0);
                         //bb_error_msg("fnmatch('%s','%s',0):%d", pattern, string, r);