From af61c5494bea72c9d43f90838e4b457e4a9dc768 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 19 May 2015 15:49:39 -0400 Subject: [PATCH] Bash-4.3 patch 38 --- parse.y | 7 ++++++- patchlevel.h | 2 +- y.tab.c | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/parse.y b/parse.y index 815db98..74b5927 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 1dbc360..4141e5d 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 */