diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2020-09-09 15:25:32 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2020-09-09 15:25:32 -0400 |
| commit | 3eb0018e75b74bb886df7fba4b1712529ce7258f (patch) | |
| tree | 13b53713ef8f483a82295324e314da48b59c9346 /lib/malloc | |
| parent | 712f80b0a49c3a0227d0b52bff5e0b763747697e (diff) | |
| download | bash-5.1-beta.tar.gz | |
bash-5.1 beta releasebash-5.1-beta
Diffstat (limited to 'lib/malloc')
| -rw-r--r-- | lib/malloc/malloc.c | 6 | ||||
| -rw-r--r-- | lib/malloc/table.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c index 94806972..439f8ef1 100644 --- a/lib/malloc/malloc.c +++ b/lib/malloc/malloc.c @@ -319,7 +319,7 @@ extern char *sbrk (); #endif /* !HAVE_DECL_SBRK */ #ifdef SHELL -extern int interrupt_immediately, running_trap; +extern int running_trap; extern int signal_is_trapped PARAMS((int)); #endif @@ -620,9 +620,9 @@ morecore (nu) blocked_sigs = 0; #ifdef SHELL # if defined (SIGCHLD) - if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD)) + if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD)) # else - if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT)) + if (running_trap || signal_is_trapped (SIGINT)) # endif #endif { diff --git a/lib/malloc/table.c b/lib/malloc/table.c index b587eea6..e6acbf4a 100644 --- a/lib/malloc/table.c +++ b/lib/malloc/table.c @@ -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); |