commit bash-20110311 snapshot

This commit is contained in:
Chet Ramey
2011-12-29 13:05:08 -05:00
parent 40647963e2
commit d9e1f41e7f
49 changed files with 13947 additions and 12188 deletions
+8 -10
View File
@@ -1438,12 +1438,11 @@ yy_readline_get ()
interrupt_immediately++;
old_sigint = (SigHandler *)set_signal_handler (SIGINT, sigint_sighandler);
}
terminate_immediately = 1;
current_readline_line = readline (current_readline_prompt ?
current_readline_prompt : "");
terminate_immediately = 0;
CHECK_TERMSIG;
if (signal_is_ignored (SIGINT) == 0)
{
interrupt_immediately--;
@@ -1603,16 +1602,15 @@ yy_stream_get ()
if (bash_input.location.file)
{
if (interactive)
{
interrupt_immediately++;
terminate_immediately++;
}
interrupt_immediately++;
/* XXX - don't need terminate_immediately; getc_with_restart checks
for terminating signals itself if read returns < 0 */
result = getc_with_restart (bash_input.location.file);
if (interactive)
{
interrupt_immediately--;
terminate_immediately--;
}
interrupt_immediately--;
}
return (result);
}