From: Chet Ramey <chet.ramey@case.edu>
Date: Tue, 19 May 2015 19:49:39 +0000 (-0400)
Subject: Bash-4.3 patch 38
X-Git-Tag: bash-4.4~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af61c5494bea72c9d43f90838e4b457e4a9dc768;p=thirdparty%2Fbash.git

Bash-4.3 patch 38
---

diff --git a/parse.y b/parse.y
index 815db98a8..74b5927db 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 a1ad6c068..8d34c53e3 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 1dbc360d6..4141e5dd0 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 */