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
@@ -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
{
-2
View File
@@ -33,8 +33,6 @@
#include "xmalloc.h"
int interrupt_immediately = 0;
static char xp[64];
main(int c, char **v)
+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);