gdbsupport: Let construct_inferior_arguments take gdb::array_view param

Adapt the construct_inferior_arguments function to
take a gdb::array_view<char * const> parameter instead
of a char * array and an int indicating the length
and adapt the only call site.

This will allow calling it more simply in a follow-up
patch introducing more uses of the function.

gdbsupport/ChangeLog:

	* common-inferior.cc, common-inferior.h (construct_inferior_arguments):
	Adapt to take a gdb::array_view<char * const> parameter.
	Adapt call site.

Change-Id: I1c6496c8c0b0eb3ef3fda96e9e3bd64c5e6cac3c

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index ffcc364f64942a626660f04c5c5c8505a1a8926e..891da91c806e42612ded631e7063b942e8056d54 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -151,8 +151,9 @@ get_inferior_args (void)
 {
   if (current_inferior ()->argc != 0)
     {
-      std::string n = construct_inferior_arguments (current_inferior ()->argc,
-                                                   current_inferior ()->argv);
+      gdb::array_view<char * const> args (current_inferior ()->argv,
+                                          current_inferior ()->argc);
+      std::string n = construct_inferior_arguments (args);
       set_inferior_args (n.c_str ());
     }
 

diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 67dcdeec07d48e7b9b60d49844d9dfd8f7103151..61b57ffc456bf959bb1c75b4a3fc5342db766751 100644 (file)
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-25  Michael Weghorn  <m.weghorn@posteo.de>
+
+       * common-inferior.cc, common-inferior.h (construct_inferior_arguments):
+       Adapt to take a gdb::array_view<char * const> parameter.
+       Adapt call site.
+
 2020-05-25  Michael Weghorn  <m.weghorn@posteo.de>
 
        * common-inferior.cc, common-inferior.h (construct_inferior_arguments):

diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
index aa8be14c742677f2ace41dea5f87cf2522d30c22..a67d1740a27d78f13c31b1b9658c96d5cdf7ca30 100644 (file)
--- a/gdbsupport/common-inferior.cc
+++ b/gdbsupport/common-inferior.cc
@@ -28,10 +28,8 @@ bool startup_with_shell = true;
 /* See common-inferior.h.  */
 
 std::string
-construct_inferior_arguments (int argc, char * const *argv)
+construct_inferior_arguments (gdb::array_view<char * const> argv)
 {
-  gdb_assert (argc >= 0);
-
   std::string result;
 
   if (startup_with_shell)
@@ -48,7 +46,7 @@ construct_inferior_arguments (int argc, char * const *argv)
       static const char special[] = "\"!#$&*()\\|[]{}<>?'`~^; \t\n";
       static const char quote = '\'';
 #endif
-      for (int i = 0; i < argc; ++i)
+      for (int i = 0; i < argv.size (); ++i)
        {
          if (i > 0)
            result += ' ';
@@ -103,19 +101,19 @@ construct_inferior_arguments (int argc, char * const *argv)
     {
       /* In this case we can't handle arguments that contain spaces,
         tabs, or newlines -- see breakup_args().  */
-      for (int i = 0; i < argc; ++i)
+      for (char *arg : argv)
        {
-         char *cp = strchr (argv[i], ' ');
+         char *cp = strchr (arg, ' ');
          if (cp == NULL)
-           cp = strchr (argv[i], '\t');
+           cp = strchr (arg, '\t');
          if (cp == NULL)
-           cp = strchr (argv[i], '\n');
+           cp = strchr (arg, '\n');
          if (cp != NULL)
            error (_("can't handle command-line "
                     "argument containing whitespace"));
        }
 
-      for (int i = 0; i < argc; ++i)
+      for (int i = 0; i < argv.size (); ++i)
        {
          if (i > 0)
            result += " ";

diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h
index 5e9fc8b0b913920bf6e35e8992e38ca12f086d25..4362934cefde8407bb42eb8569c7b7372fd1b0b0 100644 (file)
--- a/gdbsupport/common-inferior.h
+++ b/gdbsupport/common-inferior.h
@@ -21,6 +21,8 @@
 #ifndef COMMON_COMMON_INFERIOR_H
 #define COMMON_COMMON_INFERIOR_H
 
+#include "gdbsupport/array-view.h"
+
 /* Return the exec wrapper to be used when starting the inferior, or NULL
    otherwise.  */
 extern const char *get_exec_wrapper ();
@@ -60,6 +62,7 @@ extern bool startup_with_shell;
 
 /* Compute command-line string given argument vector. This does the
    same shell processing as fork_inferior.  */
-extern std::string construct_inferior_arguments (int, char * const *);
+extern std::string
+construct_inferior_arguments (gdb::array_view<char * const>);
 
 #endif /* COMMON_COMMON_INFERIOR_H */