sim: leverage gnulib

[deliverable/binutils-gdb.git] / sim / common / sim-hw.c

diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
index 6cb406f24d6c8b70c96235df284b3fc404b087a8..95d95042ded4c7a3bf0274834f2261ebdd1e2ef0 100644 (file)
--- a/sim/common/sim-hw.c
+++ b/sim/common/sim-hw.c
@@ -1,6 +1,5 @@
 /* Simulator hardware option handling.
-   Copyright (C) 1998, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Support and Andrew Cagney.
 
 This file is part of GDB, the GNU debugger.
@@ -18,6 +17,9 @@ 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, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include "sim-main.h"
 #include "sim-assert.h"
 #include "sim-options.h"
@@ -29,17 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "hw-main.h"
 #include "hw-base.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #include <ctype.h>
 #include <errno.h>
 
@@ -148,9 +141,10 @@ merge_device_file (struct sim_state *sd,
 {
   FILE *description;
   struct hw *current = STATE_HW (sd)->tree;
-  int line_nr;
-  char device_path[1000];
-  
+  char *device_path = NULL;
+  size_t buf_size = 0;
+  ssize_t device_path_len;
+
   /* try opening the file */
   description = fopen (file_name, "r");
   if (description == NULL)
@@ -158,20 +152,15 @@ merge_device_file (struct sim_state *sd,
       perror (file_name);
       return SIM_RC_FAIL;
     }
-  
-  line_nr = 0;
-  while (fgets (device_path, sizeof(device_path), description))
+
+  while ((device_path_len = getline (&device_path, &buf_size, description)) > 0)
     {
       char *device;
-      /* check that a complete line was read */
-      if (strchr (device_path, '\n') == NULL)
-       {
-         fclose (description);
-         sim_io_eprintf (sd, "%s:%d: line to long", file_name, line_nr);
-         return SIM_RC_FAIL;
-       }
-      *strchr (device_path, '\n') = '\0';
-      line_nr++;
+      char *next_line = NULL;
+
+      if (device_path[device_path_len - 1] == '\n')
+       device_path[--device_path_len] = '\0';
+
       /* skip comments ("#" or ";") and blank lines lines */
       for (device = device_path;
           *device != '\0' && isspace (*device);
@@ -180,33 +169,44 @@ merge_device_file (struct sim_state *sd,
          || device[0] == ';'
          || device[0] == '\0')
        continue;
+
       /* merge any appended lines */
-      while (device_path[strlen (device_path) - 1] == '\\')
+      while (device_path[device_path_len - 1] == '\\')
        {
-         int curlen = strlen (device_path) - 1;
+         size_t next_buf_size = 0;
+         ssize_t next_line_len;
+
          /* zap the `\' at the end of the line */
-         device_path[curlen] = '\0';
+         device_path[--device_path_len] = '\0';
+
+         /* get the next line */
+         next_line_len = getline (&next_line, &next_buf_size, description);
+         if (next_line_len <= 0)
+           break;
+
+         if (next_line[next_line_len - 1] == '\n')
+           next_line[--next_line_len] = '\0';
+
          /* append the next line */
-         if (!fgets (device_path + curlen,
-                     sizeof (device_path) - curlen,
-                     description))
+         if (buf_size - device_path_len <= next_line_len)
            {
-             fclose (description);
-             sim_io_eprintf (sd, "%s:%d: unexpected eof", file_name, line_nr);
-             return SIM_RC_FAIL;
-           }
-         if (strchr(device_path, '\n') == NULL)
-           {
-             fclose(description);
-             sim_io_eprintf (sd, "%s:%d: line to long", file_name, line_nr);
-             return SIM_RC_FAIL;
+             ptrdiff_t offset = device - device_path;
+
+             buf_size += next_buf_size;
+             device_path = xrealloc (device_path, buf_size);
+             device = device_path + offset;
            }
-         *strchr(device_path, '\n') = '\0';
-         line_nr++;
+         memcpy (device_path + device_path_len, next_line,
+                 next_line_len + 1);
+         device_path_len += next_line_len;
        }
+      free (next_line);
+
       /* parse this line */
       current = hw_tree_parse (current, "%s", device);
     }
+
+  free (device_path);
   fclose (description);
   return SIM_RC_OK;
 }
@@ -267,7 +267,7 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
        sim_hw_print (sd, sim_io_vprintf);
        return SIM_RC_OK;
       }
-  
+
     case OPTION_HW_FILE:
       {
        return merge_device_file (sd, arg);
@@ -291,8 +291,12 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
 static MODULE_INIT_FN sim_hw_init;
 static MODULE_UNINSTALL_FN sim_hw_uninstall;
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+SIM_RC sim_install_hw (struct sim_state *sd);
+
+/* Establish this object.  */
 SIM_RC
-sim_hw_install (struct sim_state *sd)
+sim_install_hw (struct sim_state *sd)
 {
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
   sim_add_option_table (sd, NULL, hw_options);
@@ -320,7 +324,7 @@ static void
 sim_hw_uninstall (struct sim_state *sd)
 {
   hw_tree_delete (STATE_HW (sd)->tree);
-  zfree (STATE_HW (sd));
+  free (STATE_HW (sd));
   STATE_HW (sd) = NULL;
 }
 
@@ -333,7 +337,7 @@ sim_hw_uninstall (struct sim_state *sd)
 /* CPU: The simulation is running and the current CPU/CIA
    initiates a data transfer. */
 
-void 
+void
 sim_cpu_hw_io_read_buffer (sim_cpu *cpu,
                           sim_cia cia,
                           struct hw *hw,
@@ -349,7 +353,7 @@ sim_cpu_hw_io_read_buffer (sim_cpu *cpu,
     sim_engine_abort (sd, cpu, cia, "broken CPU read");
 }
 
-void 
+void
 sim_cpu_hw_io_write_buffer (sim_cpu *cpu,
                            sim_cia cia,
                            struct hw *hw,
@@ -370,7 +374,7 @@ sim_cpu_hw_io_write_buffer (sim_cpu *cpu,
 
 /* SYSTEM: A data transfer is being initiated by the system. */
 
-unsigned 
+unsigned
 sim_hw_io_read_buffer (struct sim_state *sd,
                       struct hw *hw,
                       void *dest,