commit bash-20060302 snapshot

This commit is contained in:
Chet Ramey
2011-12-03 22:45:57 -05:00
parent 27a1808ccd
commit 462a7a25f1
26 changed files with 9393 additions and 71 deletions
+6 -11
View File
@@ -888,18 +888,13 @@ reset_or_restore_signal_handlers (reset)
`functrace' or `errtrace' options have been set, then let command
substitutions inherit them. Let command substitution inherit the
RETURN trap if we're in the debugger and tracing functions. */
#if defined (DEBUGGER)
if (debugging_mode == 0 || function_trace_mode == 0)
#endif
sigmodes[DEBUG_TRAP] &= ~SIG_TRAPPED;
#if defined (DEBUGGER)
if (debugging_mode == 0 || error_trace_mode == 0)
#endif
if (function_trace_mode == 0)
{
sigmodes[DEBUG_TRAP] &= ~SIG_TRAPPED;
sigmodes[RETURN_TRAP] &= ~SIG_TRAPPED;
}
if (error_trace_mode == 0)
sigmodes[ERROR_TRAP] &= ~SIG_TRAPPED;
#if defined (DEBUGGER)
if (debugging_mode == 0 || function_trace_mode == 0)
#endif
sigmodes[RETURN_TRAP] &= ~SIG_TRAPPED;
}
/* Reset trapped signals to their original values, but don't free the