138-upstream-bash43-038.patch 1.7 KB

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