Bash-4.3 patch 38

This commit is contained in:
Chet Ramey 2015-05-19 15:49:39 -04:00
commit af61c5494b
3 changed files with 13 additions and 3 deletions

View file

@ -2818,11 +2818,16 @@ time_command_acceptable ()
case AND_AND: case AND_AND:
case OR_OR: case OR_OR:
case '&': case '&':
case WHILE:
case DO: case DO:
case UNTIL:
case IF:
case THEN: case THEN:
case ELIF:
case ELSE: case ELSE:
case '{': /* } */ case '{': /* } */
case '(': /* ) */ case '(': /* )( */
case ')': /* only valid in case statement */
case BANG: /* ! time pipeline */ case BANG: /* ! time pipeline */
case TIME: /* time time pipeline */ case TIME: /* time time pipeline */
case TIMEOPT: /* time -p time pipeline */ case TIMEOPT: /* time -p time pipeline */

View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 37 #define PATCHLEVEL 38
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

View file

@ -5130,11 +5130,16 @@ time_command_acceptable ()
case AND_AND: case AND_AND:
case OR_OR: case OR_OR:
case '&': case '&':
case WHILE:
case DO: case DO:
case UNTIL:
case IF:
case THEN: case THEN:
case ELIF:
case ELSE: case ELSE:
case '{': /* } */ case '{': /* } */
case '(': /* ) */ case '(': /* )( */
case ')': /* only valid in case statement */
case BANG: /* ! time pipeline */ case BANG: /* ! time pipeline */
case TIME: /* time time pipeline */ case TIME: /* time time pipeline */
case TIMEOPT: /* time -p time pipeline */ case TIMEOPT: /* time -p time pipeline */