GDBserver: Fix ignored Ctrl-C after reconnection

[deliverable/binutils-gdb.git] / gdb / gdbserver / remote-utils.c

diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 768d2e9711d87c9538d5d963b06e3d145af9e429..2e4888a78db928bf7701dd7fe0b0b76d83dde411 100644 (file)
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -1,5 +1,5 @@
 /* Remote utility routines for the remote server for GDB.
-   Copyright (C) 1986-2016 Free Software Foundation, Inc.
+   Copyright (C) 1986-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,12 +17,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
-#include "terminal.h"
+#if HAVE_TERMIOS_H
+#include <termios.h>
+#endif
 #include "target.h"
 #include "gdbthread.h"
 #include "tdesc.h"
 #include "dll.h"
 #include "rsp-low.h"
+#include "gdbthread.h"
 #include <ctype.h>
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -217,9 +220,9 @@ handle_accept_event (int err, gdb_client_data client_data)
    NAME is the filename used for communication.  */
 
 void
-remote_prepare (char *name)
+remote_prepare (const char *name)
 {
-  char *port_str;
+  const char *port_str;
 #ifdef USE_WIN32API
   static int winsock_initialized;
 #endif
@@ -284,9 +287,9 @@ remote_prepare (char *name)
    NAME is the filename used for communication.  */
 
 void
-remote_open (char *name)
+remote_open (const char *name)
 {
-  char *port_str;
+  const char *port_str;
 
   port_str = strchr (name, ':');
 #ifdef USE_WIN32API
@@ -324,7 +327,7 @@ remote_open (char *name)
       if (remote_desc < 0)
        perror_with_name ("Could not open remote device");
 
-#ifdef HAVE_TERMIOS
+#if HAVE_TERMIOS_H
       {
        struct termios termios;
        tcgetattr (remote_desc, &termios);
@@ -341,33 +344,6 @@ remote_open (char *name)
       }
 #endif
 
-#ifdef HAVE_TERMIO
-      {
-       struct termio termio;
-       ioctl (remote_desc, TCGETA, &termio);
-
-       termio.c_iflag = 0;
-       termio.c_oflag = 0;
-       termio.c_lflag = 0;
-       termio.c_cflag &= ~(CSIZE | PARENB);
-       termio.c_cflag |= CLOCAL | CS8;
-       termio.c_cc[VMIN] = 1;
-       termio.c_cc[VTIME] = 0;
-
-       ioctl (remote_desc, TCSETA, &termio);
-      }
-#endif
-
-#ifdef HAVE_SGTTY
-      {
-       struct sgttyb sg;
-
-       ioctl (remote_desc, TIOCGETP, &sg);
-       sg.sg_flags = RAW;
-       ioctl (remote_desc, TIOCSETP, &sg);
-      }
-#endif
-
       fprintf (stderr, "Remote debugging using %s\n", name);
 
       enable_async_notification (remote_desc);
@@ -402,10 +378,7 @@ remote_close (void)
 {
   delete_file_handler (remote_desc);
 
-#ifndef USE_WIN32API
-  /* Remove SIGIO handler.  */
-  signal (SIGIO, SIG_IGN);
-#endif
+  disable_async_io ();
 
 #ifdef USE_WIN32API
   closesocket (remote_desc);
@@ -532,7 +505,7 @@ write_ptid (char *buf, ptid_t ptid)
 }
 
 static ULONGEST
-hex_or_minus_one (char *buf, char **obuf)
+hex_or_minus_one (const char *buf, const char **obuf)
 {
   ULONGEST ret;
 
@@ -553,10 +526,10 @@ hex_or_minus_one (char *buf, char **obuf)
 /* Extract a PTID from BUF.  If non-null, OBUF is set to the to one
    passed the last parsed char.  Returns null_ptid on error.  */
 ptid_t
-read_ptid (char *buf, char **obuf)
+read_ptid (const char *buf, const char **obuf)
 {
-  char *p = buf;
-  char *pp;
+  const char *p = buf;
+  const char *pp;
   ULONGEST pid = 0, tid = 0;
 
   if (*p == 'p')
@@ -664,18 +637,18 @@ putpkt_binary_1 (char *buf, int cnt, int is_notif)
          if (remote_debug)
            {
              if (is_notif)
-               fprintf (stderr, "putpkt (\"%s\"); [notif]\n", buf2);
+               debug_printf ("putpkt (\"%s\"); [notif]\n", buf2);
              else
-               fprintf (stderr, "putpkt (\"%s\"); [noack mode]\n", buf2);
-             fflush (stderr);
+               debug_printf ("putpkt (\"%s\"); [noack mode]\n", buf2);
+             debug_flush ();
            }
          break;
        }
 
       if (remote_debug)
        {
-         fprintf (stderr, "putpkt (\"%s\"); [looking for ack]\n", buf2);
-         fflush (stderr);
+         debug_printf ("putpkt (\"%s\"); [looking for ack]\n", buf2);
+         debug_flush ();
        }
 
       cc = readchar ();
@@ -688,8 +661,8 @@ putpkt_binary_1 (char *buf, int cnt, int is_notif)
 
       if (remote_debug)
        {
-         fprintf (stderr, "[received '%c' (0x%x)]\n", cc, cc);
-         fflush (stderr);
+         debug_printf ("[received '%c' (0x%x)]\n", cc, cc);
+         debug_flush ();
        }
 
       /* Check for an input interrupt while we're here.  */
@@ -889,7 +862,7 @@ readchar (void)
          if (readchar_bufcnt == 0)
            {
              if (remote_debug)
-               fprintf (stderr, "readchar: Got EOF\n");
+               debug_printf ("readchar: Got EOF\n");
            }
          else
            perror ("readchar");
@@ -977,8 +950,8 @@ getpkt (char *buf)
            break;
          if (remote_debug)
            {
-             fprintf (stderr, "[getpkt: discarding char '%c']\n", c);
-             fflush (stderr);
+             debug_printf ("[getpkt: discarding char '%c']\n", c);
+             debug_flush ();
            }
 
          if (c < 0)
@@ -1024,8 +997,8 @@ getpkt (char *buf)
     {
       if (remote_debug)
        {
-         fprintf (stderr, "getpkt (\"%s\");  [sending ack] \n", buf);
-         fflush (stderr);
+         debug_printf ("getpkt (\"%s\");  [sending ack] \n", buf);
+         debug_flush ();
        }
 
       if (write_prim ("+", 1) != 1)
@@ -1033,16 +1006,16 @@ getpkt (char *buf)
 
       if (remote_debug)
        {
-         fprintf (stderr, "[sent ack]\n");
-         fflush (stderr);
+         debug_printf ("[sent ack]\n");
+         debug_flush ();
        }
     }
   else
     {
       if (remote_debug)
        {
-         fprintf (stderr, "getpkt (\"%s\");  [no ack sent] \n", buf);
-         fflush (stderr);
+         debug_printf ("getpkt (\"%s\");  [no ack sent] \n", buf);
+         debug_flush ();
        }
     }
 
@@ -1188,7 +1161,7 @@ prepare_resume_reply (char *buf, ptid_t ptid,
 
        saved_thread = current_thread;
 
-       current_thread = find_thread_ptid (ptid);
+       switch_to_thread (ptid);
 
        regp = current_target_desc ()->expedite_regs;
 
@@ -1579,7 +1552,6 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc)
   ULONGEST written = 0;
 
   /* Send the request.  */
-  strcpy (own_buf, "qRelocInsn:");
   sprintf (own_buf, "qRelocInsn:%s;%s", paddress (oldloc),
           paddress (*to));
   if (putpkt (own_buf) < 0)