pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-09 19:50:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20200117 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2020-01-21 09:46:21 -05:00
parent abfcfa4e6f
commit 9831556ed0
26 changed files with 503 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bashline.c
+28 -3
View File
@@ -1,6 +1,6 @@
/* bashline.c -- Bash's interface to the readline library. */
/* Copyright (C) 1987-2019 Free Software Foundation, Inc.
/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
@@ -1432,7 +1432,7 @@ find_cmd_start (start)
rl_line_buffer[s])
{
/* Handle >| token crudely; treat as > not | */
if (rl_line_buffer[s] == '|' && rl_line_buffer[s-1] == '>')
if (s > 0 && rl_line_buffer[s] == '|' && rl_line_buffer[s-1] == '>')
{
ns = skip_to_delim (rl_line_buffer, s+1, COMMAND_SEPARATORS, SD_NOJMP|SD_COMPLETE/*|SD_NOSKIPCMD*/);
if (ns > start || rl_line_buffer[ns] == 0)
@@ -1440,6 +1440,28 @@ find_cmd_start (start)
os = ns+1;
continue;
}
/* The only reserved word in COMMAND_SEPARATORS is `{', so handle that
specially, making sure it's in a spot acceptable for reserved words */
if (s >= os && rl_line_buffer[s] == '{')
{
int pc, nc; /* index of previous non-whitespace, next char */
for (pc = (s > os) ? s - 1 : os; pc > os && whitespace(rl_line_buffer[pc]); pc--)
;
nc = rl_line_buffer[s+1];
/* must be preceded by a command separator or be the first non-
whitespace character since the last command separator, and
followed by a shell break character (not another `{') to be a reserved word. */
if ((pc > os && (rl_line_buffer[s-1] == '{' || strchr (COMMAND_SEPARATORS, rl_line_buffer[pc]) == 0)) ||
(shellbreak(nc) == 0)) /* }} */
{
/* Not a reserved word, look for another delim */
ns = skip_to_delim (rl_line_buffer, s+1, COMMAND_SEPARATORS, SD_NOJMP|SD_COMPLETE/*|SD_NOSKIPCMD*/);
if (ns > start || rl_line_buffer[ns] == 0)
return os;
os = ns+1;
continue;
}
}
os = s+1;
}
return os;
@@ -4284,7 +4306,10 @@ bash_execute_unix_command (count, key)
have to walk cmd_xmap using the entire key sequence. */
cmd_xmap = get_cmd_xmap_from_keymap (rl_get_keymap ());
cmd = (char *)rl_function_of_keyseq_len (rl_executing_keyseq, rl_key_sequence_length, cmd_xmap, &type);
if (type == ISKMAP && (type = ((Keymap) cmd)[ANYOTHERKEY].type) == ISMACR)
cmd = (char*)((Keymap) cmd)[ANYOTHERKEY].function;
if (cmd == 0 || type != ISMACR)
{
rl_crlf ();