aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2015-05-19 15:49:39 -0400
committerTom Powell <zifnab@zifnab06.net>2015-10-08 20:52:52 -0700
commit78d794f0304859d1356b7eb345c46b880222da18 (patch)
tree9933fc7a66e8b339021ec21ae0e3763ad6ec9dd7
parent5a7b5f98629fed19c9706a4505e6112ce2e01393 (diff)
downloadandroid_external_bash-78d794f0304859d1356b7eb345c46b880222da18.tar.gz
android_external_bash-78d794f0304859d1356b7eb345c46b880222da18.tar.bz2
android_external_bash-78d794f0304859d1356b7eb345c46b880222da18.zip
Bash-4.3 patch 38
Change-Id: I7860fb20707e81f0ad9f0d32320ace37750f9500
-rw-r--r--parse.y7
-rw-r--r--patchlevel.h2
-rw-r--r--y.tab.c7
3 files changed, 13 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 92b58ce..b887a89 100644
--- a/parse.y
+++ b/parse.y
@@ -2818,11 +2818,16 @@ time_command_acceptable ()
case AND_AND:
case OR_OR:
case '&':
+ case WHILE:
case DO:
+ case UNTIL:
+ case IF:
case THEN:
+ case ELIF:
case ELSE:
case '{': /* } */
- case '(': /* ) */
+ case '(': /* )( */
+ case ')': /* only valid in case statement */
case BANG: /* ! time pipeline */
case TIME: /* time time pipeline */
case TIMEOPT: /* time -p time pipeline */
diff --git a/patchlevel.h b/patchlevel.h
index a1ad6c0..8d34c53 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 37
+#define PATCHLEVEL 38
#endif /* _PATCHLEVEL_H_ */
diff --git a/y.tab.c b/y.tab.c
index 98c0762..4a804e4 100644
--- a/y.tab.c
+++ b/y.tab.c
@@ -5130,11 +5130,16 @@ time_command_acceptable ()
case AND_AND:
case OR_OR:
case '&':
+ case WHILE:
case DO:
+ case UNTIL:
+ case IF:
case THEN:
+ case ELIF:
case ELSE:
case '{': /* } */
- case '(': /* ) */
+ case '(': /* )( */
+ case ')': /* only valid in case statement */
case BANG: /* ! time pipeline */
case TIME: /* time time pipeline */
case TIMEOPT: /* time -p time pipeline */