15 files changed, 97 insertions, 11 deletions

diff --git a/shell/ash.c b/shell/ash.c
index bab6138da..4ae42595d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13572,7 +13572,7 @@ parsesub: {
                         do {
                                 STPUTC(c, out);
                                 c = pgetc_eatbnl();
-                        } while (!subtype && isdigit(c));
+                        } while ((subtype == 0 || subtype == VSLENGTH) && isdigit(c));
                 } else if (c != '}') {
                         /* $[{[#]]<specialchar>[}] */
                         int cc = c;
@@ -13602,11 +13602,6 @@ parsesub: {
                 } else
                         goto badsub;
 
-                if (c != '}' && subtype == VSLENGTH) {
-                        /* ${#VAR didn't end with } */
-                        goto badsub;
-                }
-
                 if (subtype == 0) {
                         static const char types[] ALIGN1 = "}-+?=";
                         /* ${VAR...} but not $VAR or ${#VAR} */
@@ -13663,6 +13658,8 @@ parsesub: {
 #endif
                         }
                 } else {
+                        if (subtype == VSLENGTH && c != '}')
+                                subtype = 0;
  badsub:
                         pungetc();
                 }
@@ -15358,7 +15355,7 @@ init(void)
 
 
 //usage:#define ash_trivial_usage
-//usage:        "[-il] [-/+Cabefmnuvx] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]"
+//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 ////////        comes from ^^^^^^^^^^optletters
 //usage:#define ash_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
diff --git a/shell/ash_test/ash-misc/control_char3.right b/shell/ash_test/ash-misc/control_char3.right
new file mode 100644
index 000000000..283e02cbb
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char3.right
@@ -0,0 +1 @@
+SHELL: line 1: : not found
diff --git a/shell/ash_test/ash-misc/control_char3.tests b/shell/ash_test/ash-misc/control_char3.tests
new file mode 100755
index 000000000..4359db3f3
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char3.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '\' SHELL
diff --git a/shell/ash_test/ash-misc/control_char4.right b/shell/ash_test/ash-misc/control_char4.right
new file mode 100644
index 000000000..2bf18e684
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char4.right
@@ -0,0 +1 @@
+SHELL: line 1: -: not found
diff --git a/shell/ash_test/ash-misc/control_char4.tests b/shell/ash_test/ash-misc/control_char4.tests
new file mode 100755
index 000000000..48010f154
--- /dev/null
+++ b/shell/ash_test/ash-misc/control_char4.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '"-"' SHELL
diff --git a/shell/ash_test/ash-parsing/bkslash_newline4.right b/shell/ash_test/ash-parsing/bkslash_newline4.right
new file mode 100644
index 000000000..2110716d1
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline4.right
@@ -0,0 +1,4 @@
+1:1
+22:22
+3:3
+Ok:0
diff --git a/shell/ash_test/ash-parsing/bkslash_newline4.tests b/shell/ash_test/ash-parsing/bkslash_newline4.tests
new file mode 100755
index 000000000..c8f5037c4
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline4.tests
@@ -0,0 +1,14 @@
+set -- 1 22 333
+echo 1:$\
+1
+echo 22:$\
+{\
+2\
+}
+echo 3:$\
+{\
+#\
+3\
+}
+echo Ok:$\
+?
diff --git a/shell/hush.c b/shell/hush.c
index 77921e11c..1aa0a400d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -339,7 +339,7 @@
  * therefore we don't show them either.
  */
 //usage:#define hush_trivial_usage
-//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]"
+//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 //usage:#define hush_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
 
@@ -3696,9 +3696,10 @@ static void debug_print_tree(struct pipe *pi, int lvl)
 
         pin = 0;
         while (pi) {
-                fdprintf(2, "%*spipe %d %sres_word=%s followup=%d %s\n",
+                fdprintf(2, "%*spipe %d #cmds:%d %sres_word=%s followup=%d %s\n",
                                 lvl*2, "",
                                 pin,
+                                pi->num_cmds,
                                 (IF_HAS_KEYWORDS(pi->pi_inverted ? "! " :) ""),
                                 RES[pi->res_word],
                                 pi->followup, PIPE[pi->followup]
@@ -3841,6 +3842,9 @@ static void done_pipe(struct parse_context *ctx, pipe_style type)
 #endif
                 /* Replace all pipes in ctx with one newly created */
                 ctx->list_head = ctx->pipe = pi;
+                /* for cases like "cmd && &", do not be tricked by last command
+                 * being null - the entire {...} & is NOT null! */
+                not_null = 1;
         } else {
  no_conv:
                 ctx->pipe->followup = type;
@@ -4994,6 +4998,32 @@ static int parse_dollar(o_string *as_string,
                  * which check invalid constructs like ${%}.
                  * Oh well... let's check that the var name part is fine... */
 
+                if (isdigit(len_single_ch)
+                 || (len_single_ch == '#' && isdigit(i_peek_and_eat_bkslash_nl(input)))
+                ) {
+                        /* Execution engine uses plain xatoi_positive()
+                         * to interpret ${NNN} and {#NNN},
+                         * check syntax here in the parser.
+                         * (bash does not support expressions in ${#NN},
+                         * e.g. ${#$var} and {#1:+WORD} are not supported).
+                         */
+                        unsigned cnt = 9; /* max 9 digits for ${NN} and 8 for {#NN} */
+                        while (1) {
+                                o_addchr(dest, ch);
+                                debug_printf_parse(": '%c'\n", ch);
+                                ch = i_getch_and_eat_bkslash_nl(input);
+                                nommu_addchr(as_string, ch);
+                                if (ch == '}')
+                                        break;
+                                if (--cnt == 0)
+                                        goto bad_dollar_syntax;
+                                if (len_single_ch != '#' && strchr(VAR_SUBST_OPS, ch))
+                                        /* ${NN<op>...} is valid */
+                                        goto eat_until_closing;
+                                if (!isdigit(ch))
+                                        goto bad_dollar_syntax;
+                        }
+                } else
                 while (1) {
                         unsigned pos;
 
@@ -5004,7 +5034,6 @@ static int parse_dollar(o_string *as_string,
                         nommu_addchr(as_string, ch);
                         if (ch == '}')
                                 break;
-
                         if (!isalnum(ch) && ch != '_') {
                                 unsigned end_ch;
                                 unsigned char last_ch;
@@ -5023,6 +5052,7 @@ static int parse_dollar(o_string *as_string,
                                          * special var name, e.g. ${#!}.
                                          */
                                 }
+ eat_until_closing:
                                 /* Eat everything until closing '}' (or ':') */
                                 end_ch = '}';
                                 if (BASH_SUBSTR
@@ -5237,6 +5267,11 @@ static int encode_string(o_string *as_string,
         }
 #endif
         o_addQchr(dest, ch);
+        if (ch == SPECIAL_VAR_SYMBOL) {
+                /* Convert "^C" to corresponding special variable reference */
+                o_addchr(dest, SPECIAL_VAR_QUOTED_SVS);
+                o_addchr(dest, SPECIAL_VAR_SYMBOL);
+        }
         goto again;
 #undef as_string
 }
@@ -5348,6 +5383,11 @@ static struct pipe *parse_stream(char **pstring,
                         if (ch == '\n')
                                 continue; /* drop \<newline>, get next char */
                         nommu_addchr(&ctx.as_string, '\\');
+                        if (ch == SPECIAL_VAR_SYMBOL) {
+                                nommu_addchr(&ctx.as_string, ch);
+                                /* Convert \^C to corresponding special variable reference */
+                                goto case_SPECIAL_VAR_SYMBOL;
+                        }
                         o_addchr(&ctx.word, '\\');
                         if (ch == EOF) {
                                 /* Testcase: eval 'echo Ok\' */
@@ -5672,6 +5712,7 @@ static struct pipe *parse_stream(char **pstring,
                 /* Note: nommu_addchr(&ctx.as_string, ch) is already done */
 
                 switch (ch) {
+                case_SPECIAL_VAR_SYMBOL:
                 case SPECIAL_VAR_SYMBOL:
                         /* Convert raw ^C to corresponding special variable reference */
                         o_addchr(&ctx.word, SPECIAL_VAR_SYMBOL);
diff --git a/shell/hush_test/hush-misc/control_char3.right b/shell/hush_test/hush-misc/control_char3.right
new file mode 100644
index 000000000..94b4f8699
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char3.right
@@ -0,0 +1 @@
+hush: can't execute '': No such file or directory
diff --git a/shell/hush_test/hush-misc/control_char3.tests b/shell/hush_test/hush-misc/control_char3.tests
new file mode 100755
index 000000000..4359db3f3
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char3.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '\' SHELL
diff --git a/shell/hush_test/hush-misc/control_char4.right b/shell/hush_test/hush-misc/control_char4.right
new file mode 100644
index 000000000..698e21427
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char4.right
@@ -0,0 +1 @@
+hush: can't execute '-': No such file or directory
diff --git a/shell/hush_test/hush-misc/control_char4.tests b/shell/hush_test/hush-misc/control_char4.tests
new file mode 100755
index 000000000..48010f154
--- /dev/null
+++ b/shell/hush_test/hush-misc/control_char4.tests
@@ -0,0 +1,2 @@
+# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
+$THIS_SH -c '"-"' SHELL
diff --git a/shell/hush_test/hush-parsing/bkslash_newline4.right b/shell/hush_test/hush-parsing/bkslash_newline4.right
new file mode 100644
index 000000000..2110716d1
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline4.right
@@ -0,0 +1,4 @@
+1:1
+22:22
+3:3
+Ok:0
diff --git a/shell/hush_test/hush-parsing/bkslash_newline4.tests b/shell/hush_test/hush-parsing/bkslash_newline4.tests
new file mode 100755
index 000000000..c8f5037c4
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline4.tests
@@ -0,0 +1,14 @@
+set -- 1 22 333
+echo 1:$\
+1
+echo 22:$\
+{\
+2\
+}
+echo 3:$\
+{\
+#\
+3\
+}
+echo Ok:$\
+?
diff --git a/shell/hush_test/hush-vars/var6.right b/shell/hush_test/hush-vars/var6.right
index 40e67fdf5..5e28d2fab 100644
--- a/shell/hush_test/hush-vars/var6.right
+++ b/shell/hush_test/hush-vars/var6.right
@@ -1,2 +1,2 @@
-hush: invalid number '1q'
+hush: syntax error: unterminated ${name}
 hush: syntax error: unterminated ${name}