hush: fix handling of words with braces. +65 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 35 insertions, 8 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 6dd6a0d03..235cee9ee 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2024,6 +2024,7 @@ static int o_glob(o_string *o, int n)
 	}
 
 	memset(&globdata, 0, sizeof(globdata));
+//TODO: can use GLOB_BRACE | GLOB_TILDE here:
 	gr = glob(pattern, 0, NULL, &globdata);
 	debug_printf_glob("glob('%s'):%d\n", pattern, gr);
 	if (gr == GLOB_NOSPACE)
@@ -5384,6 +5385,8 @@ static int parse_group(o_string *dest, struct parse_context *ctx,
 		goto skip;
 	}
 #endif
+
+#if 0 /* Prevented by caller */
 	if (command->argv /* word [word]{... */
 	 || dest->length /* word{... */
 	 || dest->o_quoted /* ""{... */
@@ -5393,6 +5396,7 @@ static int parse_group(o_string *dest, struct parse_context *ctx,
 			"syntax error, groups and arglists don't mix\n");
 		return 1;
 	}
+#endif
 
 #if ENABLE_HUSH_FUNCTIONS
  skip:
@@ -5962,10 +5966,24 @@ static struct pipe *parse_stream(char **pstring,
 			return pi;
 		}
 		nommu_addchr(&ctx.as_string, ch);
+
+		next = '\0';
+		if (ch != '\n')
+			next = i_peek(input);
+
+		is_special = "{}<>;&|()#'" /* special outside of "str" */
+				"\\$\"" IF_HUSH_TICK("`"); /* always special */
+		/* Are { and } special here? */
+		if (ctx.command->argv /* word [word]{... */
+		 || dest.length /* word{... */
+		 || dest.o_quoted /* ""{... */
+		 || (next != ';' && next != ')' && !strchr(G.ifs, next)) /* {word */
+		) {
+			/* They are not special, skip "{}" */
+			is_special += 2;
+		}
+		is_special = strchr(is_special, ch);
 		is_ifs = strchr(G.ifs, ch);
-		is_special = strchr("<>;&|(){}#'" /* special outside of "str" */
-				"\\$\"" IF_HUSH_TICK("`") /* always special */
-				, ch);
 
 		if (!is_special && !is_ifs) { /* ordinary char */
  ordinary_char:
@@ -6076,11 +6094,6 @@ static struct pipe *parse_stream(char **pstring,
 		if (is_ifs)
 			continue;
 
-		next = '\0';
-		if (ch != '\n') {
-			next = i_peek(input);
-		}
-
 		/* Catch <, > before deciding whether this word is
 		 * an assignment. a=1 2>z b=2: b=2 is still assignment */
 		switch (ch) {
diff --git a/shell/hush_test/hush-parsing/brace1.right b/shell/hush_test/hush-parsing/brace1.right
new file mode 100644
index 000000000..8619f45d3
--- /dev/null
+++ b/shell/hush_test/hush-parsing/brace1.right
@@ -0,0 +1,7 @@
+{abc}
+{
+}
+hush: can't execute '{cmd': No such file or directory
+hush: can't execute '{': No such file or directory
+hush: can't execute '{': No such file or directory
+Done: 127
diff --git a/shell/hush_test/hush-parsing/brace1.tests b/shell/hush_test/hush-parsing/brace1.tests
new file mode 100755
index 000000000..2b45927c0
--- /dev/null
+++ b/shell/hush_test/hush-parsing/brace1.tests
@@ -0,0 +1,7 @@
+echo {abc}
+echo {
+echo }
+{cmd
+""{
+{""
+echo Done: $?