Bash-4.2 patch 42

This commit is contained in:
Chet Ramey 2013-01-10 19:53:16 -05:00
commit 509a4430ae
4 changed files with 227 additions and 170 deletions

View file

@ -2393,6 +2393,7 @@ pop_alias:
is the last character). If it's not the last character, we need is the last character). If it's not the last character, we need
to consume the quoted newline and move to the next character in to consume the quoted newline and move to the next character in
the expansion. */ the expansion. */
#if defined (ALIAS)
if (expanding_alias () && shell_input_line[shell_input_line_index+1] == '\0') if (expanding_alias () && shell_input_line[shell_input_line_index+1] == '\0')
{ {
uc = 0; uc = 0;
@ -2404,6 +2405,7 @@ pop_alias:
goto next_alias_char; /* and get next character */ goto next_alias_char; /* and get next character */
} }
else else
#endif
goto restart_read; goto restart_read;
} }

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 41 #define PATCHLEVEL 42
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

385
y.tab.c

File diff suppressed because it is too large Load diff

View file

@ -142,7 +142,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE typedef union YYSTYPE
#line 323 "/Users/chet/src/bash/src/parse.y" #line 323 "/usr/src/local/chet/src/bash/bash-4.2-patched/parse.y"
{ {
WORD_DESC *word; /* the word that we read. */ WORD_DESC *word; /* the word that we read. */
int number; /* the number that we read. */ int number; /* the number that we read. */
@ -152,7 +152,7 @@ typedef union YYSTYPE
ELEMENT element; ELEMENT element;
PATTERN_LIST *pattern; PATTERN_LIST *pattern;
} }
/* Line 1489 of yacc.c. */ /* Line 1529 of yacc.c. */
#line 157 "y.tab.h" #line 157 "y.tab.h"
YYSTYPE; YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */