pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-25 23:03:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bash-5.1 patch 11: save and restore alias parsing when performing compound array assignment

Browse Source
This commit is contained in:
Chet Ramey
2021-11-17 16:46:40 -05:00
parent 910fcdc415
commit c839339fbf
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
-4
View File
@@ -6493,10 +6493,8 @@ parse_string_to_word_list (s, flags, whom)
old_expand_aliases = expand_aliases;
push_stream (1);
#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
if (ea = expanding_alias ())
parser_save_alias ();
#endif
last_read_token = WORD; /* WORD to allow reserved words here */
current_command_line_count = 0;
echo_input_at_read = expand_aliases = 0;
@@ -6531,10 +6529,8 @@ parse_string_to_word_list (s, flags, whom)
last_read_token = '\n';
pop_stream ();
#if 0 /* TAG: bash-5.2 */
if (ea)
parser_restore_alias ();
#endif
#if defined (HISTORY)
remember_on_history = old_remember_on_history;
patchlevel.h
+1 -1
View File
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 10
#define PATCHLEVEL 11
#endif /* _PATCHLEVEL_H_ */
y.tab.c
-4
View File
@@ -8787,10 +8787,8 @@ parse_string_to_word_list (s, flags, whom)
old_expand_aliases = expand_aliases;
push_stream (1);
#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
if (ea = expanding_alias ())
parser_save_alias ();
#endif
last_read_token = WORD; /* WORD to allow reserved words here */
current_command_line_count = 0;
echo_input_at_read = expand_aliases = 0;
@@ -8825,10 +8823,8 @@ parse_string_to_word_list (s, flags, whom)
last_read_token = '\n';
pop_stream ();
#if 0 /* TAG: bash-5.2 */
if (ea)
parser_restore_alias ();
#endif
#if defined (HISTORY)
remember_on_history = old_remember_on_history;