* serial.h, ser-{unix,go32,tcp}.c: Add flush_input and send_break.

[binutils-gdb.git] / gdb / ser-tcp.c

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 3b30bf1f8cf080bb9e3d03af0da1013c97f65ee5..f492bc13ccd7987181ddc2ddb199659ddff11c6a 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -64,14 +64,16 @@ tcp_open(scb, name)
   if (!port_str)
     error ("tcp_open: No colon in host name!"); /* Shouldn't ever happen */
 
-  tmp = min(port_str - name + 1, sizeof hostname);
-  strncpy (hostname, name, tmp - 1); /* Don't want colon */
+  tmp = min (port_str - name, sizeof hostname - 1);
+  strncpy (hostname, name, tmp); /* Don't want colon */
+  hostname[tmp] = '\000';      /* Tie off host name */
   port = atoi (port_str + 1);
 
   hostent = gethostbyname (hostname);
 
   if (!hostent)
     {
+      fprintf (stderr, "%s: unknown host\n", hostname);
       errno = ENOENT;
       return -1;
     }
@@ -93,9 +95,10 @@ tcp_open(scb, name)
   memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
          sizeof (struct in_addr));
 
-  if (connect(scb->fd, &sockaddr, sizeof(sockaddr)))
+  if (connect (scb->fd, &sockaddr, sizeof(sockaddr)))
     {
       close(scb->fd);
+      scb->fd = -1;
       return -1;
     }
 
@@ -137,6 +140,13 @@ tcp_set_tty_state(scb, ttystate)
   return 0;
 }
 
+static int
+tcp_return_0 (scb)
+     serial_t scb;
+{
+  return 0;
+}
+
 static void
 tcp_raw(scb)
      serial_t scb;
@@ -158,27 +168,34 @@ wait_for(scb, timeout)
 {
   int numfds;
   struct timeval tv;
-  fd_set readfds;
+  fd_set readfds, exceptfds;
 
   FD_ZERO (&readfds);
+  FD_ZERO (&exceptfds);
 
   tv.tv_sec = timeout;
   tv.tv_usec = 0;
 
   FD_SET(scb->fd, &readfds);
+  FD_SET(scb->fd, &exceptfds);
 
-  if (timeout >= 0)
-    numfds = select(scb->fd+1, &readfds, 0, 0, &tv);
-  else
-    numfds = select(scb->fd+1, &readfds, 0, 0, 0);
-
-  if (numfds <= 0)
-    if (numfds == 0)
-      return SERIAL_TIMEOUT;
-    else
-      return SERIAL_ERROR;     /* Got an error from select or poll */
-
-  return 0;
+  while (1)
+    {
+      if (timeout >= 0)
+       numfds = select(scb->fd+1, &readfds, 0, &exceptfds, &tv);
+      else
+       numfds = select(scb->fd+1, &readfds, 0, &exceptfds, 0);
+
+      if (numfds <= 0)
+       if (numfds == 0)
+         return SERIAL_TIMEOUT;
+       else if (errno == EINTR)
+         continue;
+       else
+         return SERIAL_ERROR;  /* Got an error from select or poll */
+
+      return 0;
+    }
 }
 
 /* Read a character with user-specified timeout.  TIMEOUT is number of seconds
@@ -216,6 +233,24 @@ tcp_readchar(scb, timeout)
   return *scb->bufp++;
 }
 
+static int
+tcp_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
+     serial_t scb;
+     serial_ttystate new_ttystate;
+     serial_ttystate old_ttystate;
+{
+  return 0;
+}
+
+static void
+tcp_print_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  /* Nothing to print.  */
+  return;
+}
+
 static int
 tcp_setbaudrate(scb, rate)
      serial_t scb;
@@ -224,6 +259,15 @@ tcp_setbaudrate(scb, rate)
   return 0;                    /* Never fails! */
 }
 
+static int
+tcp_set_process_group (scb, ttystate, group)
+     serial_t scb;
+     serial_ttystate ttystate;
+     int group;
+{
+  return 0;
+}
+
 static int
 tcp_write(scb, str, len)
      serial_t scb;
@@ -263,10 +307,16 @@ static struct serial_ops tcp_ops =
   tcp_close,
   tcp_readchar,
   tcp_write,
+  tcp_return_0, /* flush output */
+  tcp_return_0, /* flush input */
+  tcp_return_0, /* send break */
   tcp_raw,
   tcp_get_tty_state,
   tcp_set_tty_state,
+  tcp_print_tty_state,
+  tcp_noflush_set_tty_state,
   tcp_setbaudrate,
+  tcp_set_process_group
 };
 
 void