Change buildsym_compunit::comp_dir to be a unique_xmalloc_ptr

[deliverable/binutils-gdb.git] / gdb / ser-base.c

diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index 790cb1b98fdbd29c00c44ade43a00c2ce98106aa..3305f7be90e7c81e08cc9e24ce9cfed4ae9835ec 100644 (file)
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -1,6 +1,6 @@
 /* Generic serial interface functions.
 
-   Copyright (C) 1992-2017 Free Software Foundation, Inc.
+   Copyright (C) 1992-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -288,6 +288,8 @@ ser_base_read_error_fd (struct serial *scb, int close_fd)
          if (s == 0 && close_fd)
            {
              /* End of file.  */
+             if (serial_is_async_p (scb))
+               delete_file_handler (scb->error_fd);
              close (scb->error_fd);
              scb->error_fd = -1;
              break;
@@ -313,6 +315,17 @@ ser_base_read_error_fd (struct serial *scb, int close_fd)
     }
 }
 
+/* Event-loop callback for a serial's error_fd.  Flushes any error
+   output we might have.  */
+
+static void
+handle_error_fd (int error, gdb_client_data client_data)
+{
+  serial *scb = (serial *) client_data;
+
+  ser_base_read_error_fd (scb, 0);
+}
+
 /* Read a character with user-specified timeout.  TIMEOUT is number of
    seconds to wait, or -1 to wait forever.  Use timeout of 0 to effect
    a poll.  Returns char if successful.  Returns SERIAL_TIMEOUT if
@@ -538,14 +551,6 @@ ser_base_set_tty_state (struct serial *scb, serial_ttystate ttystate)
   return 0;
 }
 
-int
-ser_base_noflush_set_tty_state (struct serial *scb,
-                               serial_ttystate new_ttystate,
-                               serial_ttystate old_ttystate)
-{
-  return 0;
-}
-
 void
 ser_base_print_tty_state (struct serial *scb, 
                          serial_ttystate ttystate,
@@ -589,6 +594,9 @@ ser_base_async (struct serial *scb,
        fprintf_unfiltered (gdb_stdlog, "[fd%d->asynchronous]\n",
                            scb->fd);
       reschedule (scb);
+
+      if (scb->error_fd != -1)
+       add_file_handler (scb->error_fd, handle_error_fd, scb);
     }
   else
     {
@@ -607,5 +615,8 @@ ser_base_async (struct serial *scb,
          delete_timer (scb->async_state);
          break;
        }
+
+      if (scb->error_fd != -1)
+       delete_file_handler (scb->error_fd);
     }
 }