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

commit bash-20110218 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-29 13:04:06 -05:00
parent e192f34170
commit 9c2db99939
43 changed files with 26837 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
execute_cmd.c
+6 -6
View File
@@ -1504,7 +1504,7 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
else if (function_value)
return_code = return_catch_value;
else
return_code = execute_command_internal (tcom, asynchronous, NO_PIPE, NO_PIPE, fds_to_close);
return_code = execute_command_internal ((COMMAND *)tcom, asynchronous, NO_PIPE, NO_PIPE, fds_to_close);
/* If we are asked to, invert the return value. */
if (invert)
@@ -4238,11 +4238,11 @@ execute_function (var, words, flags, fds_to_close, async, subshell)
/* This is quite similar to the code in shell.c and elsewhere. */
shell_fn = find_function_def (this_shell_function->name);
sfile = shell_fn ? shell_fn->source_file : "";
array_push (funcname_a, this_shell_function->name);
array_push ((ARRAY *)funcname_a, this_shell_function->name);
array_push (bash_source_a, sfile);
array_push ((ARRAY *)bash_source_a, sfile);
t = itos (executing_line_number ());
array_push (bash_lineno_a, t);
array_push ((ARRAY *)bash_lineno_a, t);
free (t);
#endif
@@ -4317,8 +4317,8 @@ execute_function (var, words, flags, fds_to_close, async, subshell)
#if defined (ARRAY_VARS)
/* These two variables cannot be unset, and cannot be affected by the
function. */
array_pop (bash_source_a);
array_pop (bash_lineno_a);
array_pop ((ARRAY *)bash_source_a);
array_pop ((ARRAY *)bash_lineno_a);
/* FUNCNAME can be unset, and so can potentially be changed by the
function. */