pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-29 16:39:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20140307 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2014-03-21 14:14:28 -04:00
parent 62cb402128
commit f7958d04bb
32 changed files with 24318 additions and 2653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
execute_cmd.c
+6 -1
View File
@@ -286,6 +286,8 @@ int line_number_for_err_trap;
int funcnest = 0;
int funcnest_max = 0; /* bash-4.2 */
volatile int from_return_trap = 0;
int lastpipe_opt = 0;
struct fd_bitmap *current_fds_to_close = (struct fd_bitmap *)NULL;
@@ -4502,6 +4504,8 @@ execute_function (var, words, flags, fds_to_close, async, subshell)
fc = tc;
from_return_trap = 0;
return_catch_flag++;
return_val = setjmp_nosigs (return_catch);
@@ -4510,7 +4514,8 @@ execute_function (var, words, flags, fds_to_close, async, subshell)
result = return_catch_value;
/* Run the RETURN trap in the function's context. */
save_current = currently_executing_command;
run_return_trap ();
if (from_return_trap == 0)
run_return_trap ();
currently_executing_command = save_current;
}
else