packaging: bump to 2.24.90

[platform/upstream/binutils.git] / gdb / ser-unix.c

diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 3a24ac1..6389712 100644 (file)
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -1,13 +1,12 @@
 /* Serial interface for local (hardwired) serial ports on Un*x like systems
 
 /* Serial interface for local (hardwired) serial ports on Un*x like systems
 

-   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2003,
-   2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "serial.h"
 
 #include "defs.h"
 #include "serial.h"


@@ -32,8 +29,8 @@
 #include <sys/time.h>
 
 #include "gdb_select.h"
 #include <sys/time.h>
 
 #include "gdb_select.h"

-#include "gdb_string.h"

 #include "gdbcmd.h"
 #include "gdbcmd.h"

+#include "filestuff.h"

 
 #ifdef HAVE_TERMIOS
 
 
 #ifdef HAVE_TERMIOS
 


@@ -105,12 +102,12 @@ static int hardwire_setstopbits (struct serial *, int);
 
 void _initialize_ser_hardwire (void);
 
 
 void _initialize_ser_hardwire (void);
 

-/* Open up a real live device for serial I/O */
+/* Open up a real live device for serial I/O.  */

 
 static int
 hardwire_open (struct serial *scb, const char *name)
 {
 
 static int
 hardwire_open (struct serial *scb, const char *name)
 {

-  scb->fd = open (name, O_RDWR);
+  scb->fd = gdb_open_cloexec (name, O_RDWR, 0);

   if (scb->fd < 0)
     return -1;
 
   if (scb->fd < 0)
     return -1;
 


@@ -185,7 +182,21 @@ hardwire_get_tty_state (struct serial *scb)
   state = (struct hardwire_ttystate *) xmalloc (sizeof *state);
 
   if (get_tty_state (scb, state))
   state = (struct hardwire_ttystate *) xmalloc (sizeof *state);
 
   if (get_tty_state (scb, state))

-    return NULL;
+    {
+      xfree (state);
+      return NULL;
+    }
+
+  return (serial_ttystate) state;
+}
+
+static serial_ttystate
+hardwire_copy_tty_state (struct serial *scb, serial_ttystate ttystate)
+{
+  struct hardwire_ttystate *state;
+
+  state = (struct hardwire_ttystate *) xmalloc (sizeof *state);
+  *state = *(struct hardwire_ttystate *) ttystate;

 
   return (serial_ttystate) state;
 }
 
   return (serial_ttystate) state;
 }


@@ -289,7 +300,8 @@ hardwire_print_tty_state (struct serial *scb,
 #endif
 }
 
 #endif
 }
 

-/* Wait for the output to drain away, as opposed to flushing (discarding) it */
+/* Wait for the output to drain away, as opposed to flushing
+   (discarding) it.  */

 
 static int
 hardwire_drain_output (struct serial *scb)
 
 static int
 hardwire_drain_output (struct serial *scb)


@@ -305,9 +317,10 @@ hardwire_drain_output (struct serial *scb)
 #ifdef HAVE_SGTTY
   /* Get the current state and then restore it using TIOCSETP,
      which should cause the output to drain and pending input
 #ifdef HAVE_SGTTY
   /* Get the current state and then restore it using TIOCSETP,
      which should cause the output to drain and pending input

-     to be discarded. */
+     to be discarded.  */

   {
     struct hardwire_ttystate state;
   {
     struct hardwire_ttystate state;

+

     if (get_tty_state (scb, &state))
       {
        return (-1);
     if (get_tty_state (scb, &state))
       {
        return (-1);


@@ -370,16 +383,13 @@ hardwire_send_break (struct serial *scb)
 #ifdef HAVE_SGTTY
   {
     int status;
 #ifdef HAVE_SGTTY
   {
     int status;

-    struct timeval timeout;

 
     status = ioctl (scb->fd, TIOCSBRK, 0);
 
     /* Can't use usleep; it doesn't exist in BSD 4.2.  */
 
     status = ioctl (scb->fd, TIOCSBRK, 0);
 
     /* Can't use usleep; it doesn't exist in BSD 4.2.  */

-    /* Note that if this select() is interrupted by a signal it will not wait
-       the full length of time.  I think that is OK.  */
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 250000;
-    gdb_select (0, 0, 0, 0, &timeout);
+    /* Note that if this gdb_select() is interrupted by a signal it will not
+       wait the full length of time.  I think that is OK.  */
+    gdb_usleep (250000);

     status = ioctl (scb->fd, TIOCCBRK, 0);
     return status;
   }
     status = ioctl (scb->fd, TIOCCBRK, 0);
     return status;
   }


@@ -392,7 +402,8 @@ hardwire_raw (struct serial *scb)
   struct hardwire_ttystate state;
 
   if (get_tty_state (scb, &state))
   struct hardwire_ttystate state;
 
   if (get_tty_state (scb, &state))

-    fprintf_unfiltered (gdb_stderr, "get_tty_state failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "get_tty_state failed: %s\n",
+                       safe_strerror (errno));

 
 #ifdef HAVE_TERMIOS
   state.termios.c_iflag = 0;
 
 #ifdef HAVE_TERMIOS
   state.termios.c_iflag = 0;


@@ -435,24 +446,24 @@ hardwire_raw (struct serial *scb)
   scb->current_timeout = 0;
 
   if (set_tty_state (scb, &state))
   scb->current_timeout = 0;
 
   if (set_tty_state (scb, &state))

-    fprintf_unfiltered (gdb_stderr, "set_tty_state failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "set_tty_state failed: %s\n",
+                       safe_strerror (errno));

 }
 
 /* Wait for input on scb, with timeout seconds.  Returns 0 on success,
    otherwise SERIAL_TIMEOUT or SERIAL_ERROR.
 
    For termio{s}, we actually just setup VTIME if necessary, and let the
 }
 
 /* Wait for input on scb, with timeout seconds.  Returns 0 on success,
    otherwise SERIAL_TIMEOUT or SERIAL_ERROR.
 
    For termio{s}, we actually just setup VTIME if necessary, and let the

-   timeout occur in the read() in hardwire_read().
- */
+   timeout occur in the read() in hardwire_read().  */

 
 /* FIXME: cagney/1999-09-16: Don't replace this with the equivalent
    ser_base*() until the old TERMIOS/SGTTY/... timer code has been
 
 /* FIXME: cagney/1999-09-16: Don't replace this with the equivalent
    ser_base*() until the old TERMIOS/SGTTY/... timer code has been

-   flushed. . */
+   flushed. .  */

 
 /* NOTE: cagney/1999-09-30: Much of the code below is dead.  The only
    possible values of the TIMEOUT parameter are ONE and ZERO.
    Consequently all the code that tries to handle the possability of
 
 /* NOTE: cagney/1999-09-30: Much of the code below is dead.  The only
    possible values of the TIMEOUT parameter are ONE and ZERO.
    Consequently all the code that tries to handle the possability of

-   an overflowed timer is unnecessary. */
+   an overflowed timer is unnecessary.  */

 
 static int
 wait_for (struct serial *scb, int timeout)
 
 static int
 wait_for (struct serial *scb, int timeout)


@@ -466,7 +477,7 @@ wait_for (struct serial *scb, int timeout)
 
       /* NOTE: Some OS's can scramble the READFDS when the select()
          call fails (ex the kernel with Red Hat 5.2).  Initialize all
 
       /* NOTE: Some OS's can scramble the READFDS when the select()
          call fails (ex the kernel with Red Hat 5.2).  Initialize all

-         arguments before each call. */
+         arguments before each call.  */

 
       tv.tv_sec = timeout;
       tv.tv_usec = 0;
 
       tv.tv_sec = timeout;
       tv.tv_usec = 0;


@@ -485,7 +496,7 @@ wait_for (struct serial *scb, int timeout)
        else if (errno == EINTR)
          continue;
        else
        else if (errno == EINTR)
          continue;
        else

-         return SERIAL_ERROR;  /* Got an error from select or poll */
+         return SERIAL_ERROR;  /* Got an error from select or poll.  */

 
       return 0;
     }
 
       return 0;
     }


@@ -501,7 +512,8 @@ wait_for (struct serial *scb, int timeout)
     struct hardwire_ttystate state;
 
     if (get_tty_state (scb, &state))
     struct hardwire_ttystate state;
 
     if (get_tty_state (scb, &state))

-      fprintf_unfiltered (gdb_stderr, "get_tty_state failed: %s\n", safe_strerror (errno));
+      fprintf_unfiltered (gdb_stderr, "get_tty_state failed: %s\n",
+                         safe_strerror (errno));

 
 #ifdef HAVE_TERMIOS
     if (timeout < 0)
 
 #ifdef HAVE_TERMIOS
     if (timeout < 0)


@@ -553,27 +565,29 @@ wait_for (struct serial *scb, int timeout)
 #endif
 
     if (set_tty_state (scb, &state))
 #endif
 
     if (set_tty_state (scb, &state))

-      fprintf_unfiltered (gdb_stderr, "set_tty_state failed: %s\n", safe_strerror (errno));
+      fprintf_unfiltered (gdb_stderr, "set_tty_state failed: %s\n",
+                         safe_strerror (errno));

 
     return 0;
   }
 #endif /* HAVE_TERMIO || HAVE_TERMIOS */
 }
 
 
     return 0;
   }
 #endif /* HAVE_TERMIO || HAVE_TERMIOS */
 }
 

-/* 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 timeout expired, EOF if line
-   dropped dead, or SERIAL_ERROR for any other error (see errno in that case).  */
+/* 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
+   timeout expired, EOF if line dropped dead, or SERIAL_ERROR for any
+   other error (see errno in that case).  */

 
 /* FIXME: cagney/1999-09-16: Don't replace this with the equivalent
    ser_base*() until the old TERMIOS/SGTTY/... timer code has been
 
 /* FIXME: cagney/1999-09-16: Don't replace this with the equivalent
    ser_base*() until the old TERMIOS/SGTTY/... timer code has been

-   flushed. */
+   flushed.  */

 
 /* NOTE: cagney/1999-09-16: This function is not identical to
    ser_base_readchar() as part of replacing it with ser_base*()
    merging will be required - this code handles the case where read()
    times out due to no data while ser_base_readchar() doesn't expect
 
 /* NOTE: cagney/1999-09-16: This function is not identical to
    ser_base_readchar() as part of replacing it with ser_base*()
    merging will be required - this code handles the case where read()
    times out due to no data while ser_base_readchar() doesn't expect

-   that. */
+   that.  */

 
 static int
 do_hardwire_readchar (struct serial *scb, int timeout)
 
 static int
 do_hardwire_readchar (struct serial *scb, int timeout)


@@ -635,7 +649,7 @@ do_hardwire_readchar (struct serial *scb, int timeout)
          else if (errno == EINTR)
            continue;
          else
          else if (errno == EINTR)
            continue;
          else

-           return SERIAL_ERROR;        /* Got an error from read */
+           return SERIAL_ERROR;        /* Got an error from read.  */

        }
 
       scb->bufcnt = status;
        }
 
       scb->bufcnt = status;


@@ -767,30 +781,31 @@ rate_to_code (int rate)
 
   for (i = 0; baudtab[i].rate != -1; i++)
     {
 
   for (i = 0; baudtab[i].rate != -1; i++)
     {

-      /* test for perfect macth. */
+      /* test for perfect macth.  */

       if (rate == baudtab[i].rate)
         return baudtab[i].code;
       else
         {
       if (rate == baudtab[i].rate)
         return baudtab[i].code;
       else
         {

-         /* check if it is in between valid values. */
+         /* check if it is in between valid values.  */

           if (rate < baudtab[i].rate)
            {
              if (i)
                {
           if (rate < baudtab[i].rate)
            {
              if (i)
                {

-                 warning (_("Invalid baud rate %d.  Closest values are %d and %d."),
-                           rate, baudtab[i - 1].rate, baudtab[i].rate);
+                 warning (_("Invalid baud rate %d.  "
+                            "Closest values are %d and %d."),
+                          rate, baudtab[i - 1].rate, baudtab[i].rate);

                }
              else
                {
                  warning (_("Invalid baud rate %d.  Minimum value is %d."),
                }
              else
                {
                  warning (_("Invalid baud rate %d.  Minimum value is %d."),

-                           rate, baudtab[0].rate);
+                          rate, baudtab[0].rate);

                }
              return -1;
            }
         }
     }
  
                }
              return -1;
            }
         }
     }
  

-  /* The requested speed was too large. */
+  /* The requested speed was too large.  */

   warning (_("Invalid baud rate %d.  Maximum value is %d."),
             rate, baudtab[i - 1].rate);
   return -1;
   warning (_("Invalid baud rate %d.  Maximum value is %d."),
             rate, baudtab[i - 1].rate);
   return -1;


@@ -805,7 +820,7 @@ hardwire_setbaudrate (struct serial *scb, int rate)
   if (baud_code < 0)
     {
       /* The baud rate was not valid.
   if (baud_code < 0)
     {
       /* The baud rate was not valid.

-         A warning has already been issued. */
+         A warning has already been issued.  */

       errno = EINVAL;
       return -1;
     }
       errno = EINVAL;
       return -1;
     }


@@ -889,35 +904,41 @@ hardwire_close (struct serial *scb)
 }
 \f
 \f
 }
 \f
 \f

+
+/* The hardwire ops.  */
+
+static const struct serial_ops hardwire_ops =
+{
+  "hardwire",
+  hardwire_open,
+  hardwire_close,
+  NULL,
+  /* FIXME: Don't replace this with the equivalent ser_base*() until
+     the old TERMIOS/SGTTY/... timer code has been flushed.  cagney
+     1999-09-16.  */
+  hardwire_readchar,
+  ser_base_write,
+  hardwire_flush_output,
+  hardwire_flush_input,
+  hardwire_send_break,
+  hardwire_raw,
+  hardwire_get_tty_state,
+  hardwire_copy_tty_state,
+  hardwire_set_tty_state,
+  hardwire_print_tty_state,
+  hardwire_noflush_set_tty_state,
+  hardwire_setbaudrate,
+  hardwire_setstopbits,
+  hardwire_drain_output,
+  ser_base_async,
+  ser_unix_read_prim,
+  ser_unix_write_prim
+};
+

 void
 _initialize_ser_hardwire (void)
 {
 void
 _initialize_ser_hardwire (void)
 {

-  struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, 0, sizeof (struct serial_ops));
-  ops->name = "hardwire";
-  ops->next = 0;
-  ops->open = hardwire_open;
-  ops->close = hardwire_close;
-  /* FIXME: Don't replace this with the equivalent ser_base*() until
-     the old TERMIOS/SGTTY/... timer code has been flushed. cagney
-     1999-09-16. */
-  ops->readchar = hardwire_readchar;
-  ops->write = ser_base_write;
-  ops->flush_output = hardwire_flush_output;
-  ops->flush_input = hardwire_flush_input;
-  ops->send_break = hardwire_send_break;
-  ops->go_raw = hardwire_raw;
-  ops->get_tty_state = hardwire_get_tty_state;
-  ops->set_tty_state = hardwire_set_tty_state;
-  ops->print_tty_state = hardwire_print_tty_state;
-  ops->noflush_set_tty_state = hardwire_noflush_set_tty_state;
-  ops->setbaudrate = hardwire_setbaudrate;
-  ops->setstopbits = hardwire_setstopbits;
-  ops->drain_output = hardwire_drain_output;
-  ops->async = ser_base_async;
-  ops->read_prim = ser_unix_read_prim;
-  ops->write_prim = ser_unix_write_prim;
-  serial_add_interface (ops);
+  serial_add_interface (&hardwire_ops);

 
 #ifdef HAVE_TERMIOS
 #ifdef CRTSCTS
 
 #ifdef HAVE_TERMIOS
 #ifdef CRTSCTS