Imported from ../bash-4.0-rc1.tar.gz.

This commit is contained in:
Jari Aalto 2009-01-12 13:36:28 +00:00
commit 3185942a52
666 changed files with 188710 additions and 54674 deletions

39
sig.c
View file

@ -1,22 +1,22 @@
/* sig.c - interface for shell signal handlers and signal initialization. */
/* Copyright (C) 1994-2006 Free Software Foundation, Inc.
/* Copyright (C) 1994-2009 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
Bash is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2, or (at your option) any later
version.
Bash is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Bash is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
Bash is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with Bash; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
You should have received a copy of the GNU General Public License
along with Bash. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
@ -56,6 +56,8 @@ extern int last_command_exit_value;
extern int last_command_exit_signal;
extern int return_catch_flag;
extern int loop_level, continuing, breaking;
extern int executing_list;
extern int comsub_ignore_return;
extern int parse_and_execute_level, shell_initialized;
/* Non-zero after SIGINT. */
@ -366,7 +368,7 @@ top_level_cleanup ()
run_unwind_protects ();
loop_level = continuing = breaking = 0;
return_catch_flag = 0;
executing_list = comsub_ignore_return = return_catch_flag = 0;
}
/* What to do when we've been interrupted, and it is safe to handle it. */
@ -391,7 +393,7 @@ throw_to_top_level ()
/* Run any traps set on SIGINT. */
run_interrupt_trap ();
/* Cleanup string parser environment. */
/* Clean up string parser environment. */
while (parse_and_execute_level)
parse_and_execute_cleanup ();
@ -408,7 +410,7 @@ throw_to_top_level ()
#if defined (READLINE)
if (interactive)
bashline_reinitialize ();
bashline_reset ();
#endif /* READLINE */
#if defined (PROCESS_SUBSTITUTION)
@ -417,7 +419,7 @@ throw_to_top_level ()
run_unwind_protects ();
loop_level = continuing = breaking = 0;
return_catch_flag = 0;
executing_list = comsub_ignore_return = return_catch_flag = 0;
if (interactive && print_newline)
{
@ -448,6 +450,7 @@ termsig_sighandler (sig)
{
terminating_signal = sig;
/* XXX - should this also trigger when interrupt_immediately is set? */
if (terminate_immediately)
{
terminate_immediately = 0;
@ -490,6 +493,10 @@ termsig_handler (sig)
unlink_fifo_list ();
#endif /* PROCESS_SUBSTITUTION */
/* Reset execution context */
loop_level = continuing = breaking = 0;
executing_list = comsub_ignore_return = return_catch_flag = 0;
run_exit_trap ();
set_signal_handler (sig, SIG_DFL);
kill (getpid (), sig);