OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdbsupport: Let construct_inferior_arguments take gdb::array_view param

Browse Source 
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
This commit is contained in:
Michael Weghorn 2020-05-25 11:38:32 -04:00 committed by Simon Marchi
parent c699004a29
commit 8c4b5f3d98
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/infcmd.c
View File

@ -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 ());
}

6
gdbsupport/ChangeLog
View File

@ -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):

16
gdbsupport/common-inferior.cc
View File

@ -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 += " ";

5
gdbsupport/common-inferior.h
View File

@ -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 */