[PATCH v5 3/9] gdbsupport: Let construct_inferior_arguments take gdb::array_view param

Michael Weghorn
2020-05-20T16:21:36Z

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:

2020-05-13 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.
---
gdb/infcmd.c | 5 +++--
gdbsupport/common-inferior.cc | 16 +++++++---------
gdbsupport/common-inferior.h | 5 ++++-
3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index ffcc364f64..891da91c80 100644
--- 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/common-inferior.cc b/gdbsupport/common-inferior.cc
index aa8be14c74..a67d1740a2 100644
--- 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 5e9fc8b0b9..4362934cef 100644
--- 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 */
--
2.26.2