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

fix for line numbers for nested function declarations; fix execve error for ENOENT

Browse Source
This commit is contained in:
Chet Ramey
2022-10-11 16:17:22 -04:00
parent 22f21b760e
commit 55a8311420
6 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+8 -4
View File
@@ -291,9 +291,11 @@ static int shell_input_line_terminator;
/* The line number in a script on which a function definition starts. */
static int function_dstart;
static int save_dstart = -1;
/* The line number in a script on which a function body starts. */
static int function_bstart;
static int save_bstart = -1;
/* The line number in a script at which an arithmetic for command starts. */
static int arith_for_lineno;
@@ -945,13 +947,13 @@ case_command: CASE WORD newline_list IN newline_list ESAC
;
function_def: WORD '(' ')' newline_list function_body
{ $$ = make_function_def ($1, $5, function_dstart, function_bstart); }
{ $$ = make_function_def ($1, $5, function_dstart, function_bstart); function_dstart = save_dstart; }
| FUNCTION WORD '(' ')' newline_list function_body
{ $$ = make_function_def ($2, $6, function_dstart, function_bstart); }
{ $$ = make_function_def ($2, $6, function_dstart, function_bstart); function_dstart = save_dstart; }
| FUNCTION WORD function_body
{ $$ = make_function_def ($2, $3, function_dstart, function_bstart); }
{ $$ = make_function_def ($2, $3, function_dstart, function_bstart); function_dstart = save_dstart; }
| FUNCTION WORD '\n' newline_list function_body
{ $$ = make_function_def ($2, $5, function_dstart, function_bstart); }
{ $$ = make_function_def ($2, $5, function_dstart, function_bstart); function_dstart = save_dstart; }
;
function_body: shell_command
@@ -3557,6 +3559,7 @@ read_token (command)
#if defined (ALIAS)
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
save_dstart = function_dstart;
function_dstart = line_number;
}
@@ -5319,6 +5322,7 @@ got_token:
{
case FUNCTION:
parser_state |= PST_ALLOWOPNBRC;
save_dstart = function_dstart;
function_dstart = line_number;
break;
case CASE: