commit bash-20200707 snapshot

This commit is contained in:
Chet Ramey
2020-07-10 10:08:56 -04:00
parent 9c953962b4
commit 5adc7cd3ec
14 changed files with 75 additions and 54 deletions
+3 -3
View File
@@ -29,7 +29,7 @@
#include "table.h"
#ifdef SHELL
extern int interrupt_immediately, running_trap;
extern int running_trap;
extern int signal_is_trapped PARAMS((int));
#endif
@@ -174,7 +174,7 @@ mregister_alloc (tag, mem, size, file, line)
/* Block all signals in case we are executed from a signal handler. */
blocked_sigs = 0;
#ifdef SHELL
if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
#endif
{
_malloc_block_signals (&set, &oset);
@@ -229,7 +229,7 @@ mregister_free (mem, size, file, line)
/* Block all signals in case we are executed from a signal handler. */
blocked_sigs = 0;
#ifdef SHELL
if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
#endif
{
_malloc_block_signals (&set, &oset);