bash-4.3-beta overlay

[thirdparty/bash.git] / input.c

diff --git a/input.c b/input.c
index 5a2b095313ad055ce6114fc67379e887f2a0d309..e809a38ec36c8dc2ae79a4f197563762985ec0de 100644 (file)
--- a/input.c
+++ b/input.c
@@ -83,7 +83,9 @@ getc_with_restart (stream)
     {
       while (1)
        {
-         CHECK_TERMSIG;
+         QUIT;
+         run_pending_traps ();
+
          local_bufused = read (fileno (stream), localbuf, sizeof(localbuf));
          if (local_bufused > 0)
            break;
@@ -306,7 +308,7 @@ save_bash_input (fd, new_fd)
    the buffered stream.  Make sure the file descriptor used to save bash
    input is set close-on-exec. Returns 0 on success, -1 on failure.  This
    works only if fd is > 0 -- if fd == 0 and bash is reading input from
-   fd 0, save_bash_input is used instead, to cooperate with input
+   fd 0, sync_buffered_stream is used instead, to cooperate with input
    redirection (look at redir.c:add_undo_redirect()). */
 int
 check_bash_input (fd)