commit bash-20160520 snapshot

This commit is contained in:
Chet Ramey
2016-05-23 09:57:30 -04:00
parent 0fcb334438
commit bddda3d2e1
32 changed files with 625 additions and 113 deletions
+8 -3
View File
@@ -6011,6 +6011,11 @@ command_substitute (string, quoted)
trap strings. Set a flag noting that we have to free the
trap strings if we run trap to change a signal disposition. */
reset_signal_handlers ();
if (ISINTERRUPT)
{
kill (getpid (), SIGINT);
CLRINTERRUPT; /* if we're ignoring SIGINT somehow */
}
QUIT; /* catch any interrupts we got post-fork */
subshell_environment |= SUBSHELL_RESETTRAP;
}
@@ -6040,6 +6045,9 @@ command_substitute (string, quoted)
if (pid == 0)
{
/* The currently executing shell is not interactive. */
interactive = 0;
set_sigint_handler (); /* XXX */
free_pushed_string_input ();
@@ -6077,9 +6085,6 @@ command_substitute (string, quoted)
sh_setlinebuf (stdout);
#endif /* __CYGWIN__ */
/* The currently executing shell is not interactive. */
interactive = 0;
/* This is a subshell environment. */
subshell_environment |= SUBSHELL_COMSUB;