summaryrefslogtreecommitdiff
path: root/source/a/bash/bash-4.3-patches/bash43-038
blob: e0de74e081354cf4ee008e54626c304c1a1f5702 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.3
Patch-ID:	bash43-038

Bug-Reported-by:	worley@alum.mit.edu (Dale R. Worley)
Bug-Reference-ID:	<201406100051.s5A0pCeB014978@hobgoblin.ariadne.com>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html

Bug-Description:

There are a number of instances where `time' is not recognized as a reserved
word when the shell grammar says it should be.

Patch (apply with `patch -p0'):

*** ../bash-4.3-patched/parse.y	2014-04-07 11:56:12.000000000 -0400
--- parse.y	2014-06-11 10:25:53.000000000 -0400
***************
*** 2819,2827 ****
      case OR_OR:
      case '&':
      case DO:
      case THEN:
      case ELSE:
      case '{':		/* } */
!     case '(':		/* ) */
      case BANG:		/* ! time pipeline */
      case TIME:		/* time time pipeline */
--- 2819,2832 ----
      case OR_OR:
      case '&':
+     case WHILE:
      case DO:
+     case UNTIL:
+     case IF:
      case THEN:
+     case ELIF:
      case ELSE:
      case '{':		/* } */
!     case '(':		/* )( */
!     case ')':		/* only valid in case statement */
      case BANG:		/* ! time pipeline */
      case TIME:		/* time time pipeline */
*** ../bash-4.3-patched/y.tab.c	2014-10-05 13:52:50.000000000 -0400
--- y.tab.c	2015-05-19 15:08:43.000000000 -0400
***************
*** 5131,5139 ****
      case OR_OR:
      case '&':
      case DO:
      case THEN:
      case ELSE:
      case '{':		/* } */
!     case '(':		/* ) */
      case BANG:		/* ! time pipeline */
      case TIME:		/* time time pipeline */
--- 5131,5144 ----
      case OR_OR:
      case '&':
+     case WHILE:
      case DO:
+     case UNTIL:
+     case IF:
      case THEN:
+     case ELIF:
      case ELSE:
      case '{':		/* } */
!     case '(':		/* )( */
!     case ')':		/* only valid in case statement */
      case BANG:		/* ! time pipeline */
      case TIME:		/* time time pipeline */
*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 37
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 38
  
  #endif /* _PATCHLEVEL_H_ */