* corelow.c, exec.c, inftarg.c, m3-nat.c, op50-rom.c, procfs.c,

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

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 4f4fcdbc2c382a9b4fa08dfbe23ad0953ff19bed..7e5735b53512dbd3086ca78a34d8e943f0b7945d 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -39,7 +39,7 @@ static int wait_for PARAMS ((serial_t scb, int timeout));
 static int tcp_readchar PARAMS ((serial_t scb, int timeout));
 static int tcp_setbaudrate PARAMS ((serial_t scb, int rate));
 static int tcp_write PARAMS ((serial_t scb, const char *str, int len));
-static void tcp_restore PARAMS ((serial_t scb));
+/* FIXME: static void tcp_restore PARAMS ((serial_t scb)); */
 static void tcp_close PARAMS ((serial_t scb));
 static serial_ttystate tcp_get_tty_state PARAMS ((serial_t scb));
 static int tcp_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
@@ -57,20 +57,23 @@ tcp_open(scb, name)
   struct sockaddr_in sockaddr;
   int tmp;
   char hostname[100];
+  struct protoent *protoent;
 
   port_str = strchr (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_unfiltered (gdb_stderr, "%s: unknown host\n", hostname);
       errno = ENOENT;
       return -1;
     }
@@ -92,14 +95,20 @@ 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;
     }
 
+  protoent = getprotobyname ("tcp");
+  if (!protoent)
+    return -1;
+
   tmp = 1;
-  if (setsockopt (scb->fd, 6, TCP_NODELAY, (char *)&tmp, sizeof(tmp)))
+  if (setsockopt (scb->fd, protoent->p_proto, TCP_NODELAY,
+                 (char *)&tmp, sizeof(tmp)))
     return -1;
 
   signal(SIGPIPE, SIG_IGN);    /* If we don't do this, then GDB simply exits
@@ -131,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;
@@ -152,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
@@ -195,7 +218,12 @@ tcp_readchar(scb, timeout)
   if (status < 0)
     return status;
 
-  scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
+  while (1)
+    {
+      scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
+      if (scb->bufcnt != -1 || errno != EINTR)
+       break;
+    }
 
   if (scb->bufcnt <= 0)
     if (scb->bufcnt == 0)
@@ -210,6 +238,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;
@@ -257,9 +303,14 @@ 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,
 };