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

commit bash-20091015 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-08 20:18:35 -05:00
parent d5362af881
commit e1e48bbabe
99 changed files with 30476 additions and 24169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
execute_cmd.c
+10 -2
View File
@@ -607,7 +607,6 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
else
exec_result = last_command_exit_value;
if (user_subshell && was_error_trap && ignore_return == 0 && invert == 0 && exec_result != EXECUTION_SUCCESS)
{
last_command_exit_value = exec_result;
@@ -1287,6 +1286,7 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
{
int user_subshell, return_code, function_value, should_redir_stdin, invert;
int ois, user_coproc;
int result;
COMMAND *tcom;
USE_VAR(user_subshell);
@@ -1453,13 +1453,21 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
invert = (tcom->flags & CMD_INVERT_RETURN) != 0;
tcom->flags &= ~CMD_INVERT_RETURN;
result = setjmp (top_level);
/* If we're inside a function while executing this subshell, we
need to handle a possible `return'. */
function_value = 0;
if (return_catch_flag)
function_value = setjmp (return_catch);
if (function_value)
/* If we're going to exit the shell, we don't want to invert the return
status. */
if (result == EXITPROG)
invert = 0, return_code = last_command_exit_value;
else if (result)
return_code = EXECUTION_FAILURE;
else if (function_value)
return_code = return_catch_value;
else
return_code = execute_command_internal (tcom, asynchronous, NO_PIPE, NO_PIPE, fds_to_close);