138-upstream-bash43-038.patch (1746B)
1 BASH PATCH REPORT 2 ================= 3 4 Bash-Release: 4.3 5 Patch-ID: bash43-038 6 7 Bug-Reported-by: worley@alum.mit.edu (Dale R. Worley) 8 Bug-Reference-ID: <201406100051.s5A0pCeB014978@hobgoblin.ariadne.com> 9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html 10 11 Bug-Description: 12 13 There are a number of instances where `time' is not recognized as a reserved 14 word when the shell grammar says it should be. 15 16 Patch (apply with `patch -p0'): 17 18 --- a/parse.y 19 +++ b/parse.y 20 @@ -2818,11 +2818,16 @@ time_command_acceptable () 21 case AND_AND: 22 case OR_OR: 23 case '&': 24 + case WHILE: 25 case DO: 26 + case UNTIL: 27 + case IF: 28 case THEN: 29 + case ELIF: 30 case ELSE: 31 case '{': /* } */ 32 - case '(': /* ) */ 33 + case '(': /* )( */ 34 + case ')': /* only valid in case statement */ 35 case BANG: /* ! time pipeline */ 36 case TIME: /* time time pipeline */ 37 case TIMEOPT: /* time -p time pipeline */ 38 --- a/y.tab.c 39 +++ b/y.tab.c 40 @@ -5130,11 +5130,16 @@ time_command_acceptable () 41 case AND_AND: 42 case OR_OR: 43 case '&': 44 + case WHILE: 45 case DO: 46 + case UNTIL: 47 + case IF: 48 case THEN: 49 + case ELIF: 50 case ELSE: 51 case '{': /* } */ 52 - case '(': /* ) */ 53 + case '(': /* )( */ 54 + case ')': /* only valid in case statement */ 55 case BANG: /* ! time pipeline */ 56 case TIME: /* time time pipeline */ 57 case TIMEOPT: /* time -p time pipeline */ 58 --- a/patchlevel.h 59 +++ b/patchlevel.h 60 @@ -25,6 +25,6 @@ 61 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh 62 looks for to find the patch level (for the sccs version string). */ 63 64 -#define PATCHLEVEL 37 65 +#define PATCHLEVEL 38 66 67 #endif /* _PATCHLEVEL_H_ */