pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-05 19:30:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix history expansion to not perform quick substitution on a new line that's part of a quoted string; save the value of $_ around prompt string decoding

Browse Source
This commit is contained in:
Chet Ramey
2023-12-19 09:56:34 -05:00
parent 9d51df7546
commit aa2d23cfac
24 changed files with 1973 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+5 -4
View File
@@ -2931,9 +2931,7 @@ execute_variable_command (const char *command, const char *vname)
sh_parser_state_t ps;
save_parser_state (&ps);
last_lastarg = get_string_value ("_");
if (last_lastarg)
last_lastarg = savestring (last_lastarg);
last_lastarg = save_lastarg ();
parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOOPTIMIZE);
@@ -6126,7 +6124,7 @@ char *
decode_prompt_string (char *string)
{
WORD_LIST *list;
char *result, *t, *orig_string;
char *result, *t, *orig_string, *last_lastarg;
struct dstack save_dstack;
int last_exit_value, last_comsub_pid, last_comsub_status;
#if defined (PROMPT_STRING_DECODE)
@@ -6535,10 +6533,13 @@ not_escape:
last_exit_value = last_command_exit_value;
last_comsub_pid = last_command_subst_pid;
last_comsub_status = last_command_subst_status;
last_lastarg = save_lastarg ();
list = expand_prompt_string (result, Q_DOUBLE_QUOTES, 0);
free (result);
result = string_list (list);
dispose_words (list);
bind_lastarg (last_lastarg);
free (last_lastarg);
last_command_exit_value = last_exit_value;
last_command_subst_pid = last_comsub_pid;
last_command_subst_status = last_comsub_status;