diff options
Diffstat (limited to 'eval.c')
| -rw-r--r-- | eval.c | 33 |
1 files changed, 19 insertions, 14 deletions
@@ -1,22 +1,22 @@ /* eval.c -- reading and evaluating commands. */ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996-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. */ + along with Bash. If not, see <http://www.gnu.org/licenses/>. +*/ #include "config.h" @@ -71,9 +71,10 @@ reader_loop () int our_indirection_level; COMMAND * volatile current_command; - current_command = (COMMAND *)NULL; USE_VAR(current_command); + current_command = (COMMAND *)NULL; + our_indirection_level = ++indirection_level; while (EOF_Reached == 0) @@ -106,7 +107,11 @@ reader_loop () goto exec_done; case DISCARD: - last_command_exit_value = 1; + /* Make sure the exit status is reset to a non-zero value, but + leave existing non-zero values (e.g., > 128 on signal) + alone. */ + if (last_command_exit_value == 0) + last_command_exit_value = EXECUTION_FAILURE; if (subshell_environment) { current_command = (COMMAND *)NULL; @@ -150,7 +155,6 @@ reader_loop () executing = 1; stdin_redir = 0; - execute_command (current_command); exec_done: @@ -181,6 +185,7 @@ alrm_catcher(i) int i; { printf (_("\007timed out waiting for input: auto-logout\n")); + fflush (stdout); bash_logout (); /* run ~/.bash_logout if this is a login shell */ jump_to_top_level (EXITPROG); SIGRETURN (0); |