[PATCH 2/8] gdbsupport: Make escaping in construct_inferior_arguments optional

[Michael Weghorn <m.weghorn@posteo.de>]

Add a new bool param 'escape_args' to 'construct_inferior_arguments'
that specifies whether or not the arguments should be escaped for the
case that the debuggee is run in a shell.

The new param defaults to 'true' so the behaviour of existing
uses of the function remains unchanged.

Uses of the function with 'escape_args=false' will be added in
follow-up commits.
---
 gdbsupport/common-inferior.cc | 13 ++++++++++---
 gdbsupport/common-inferior.h  |  9 ++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
index d6b99a89a81..ca2355332d3 100644
--- a/gdbsupport/common-inferior.cc
+++ b/gdbsupport/common-inferior.cc
@@ -102,7 +102,8 @@ escape_arg_as_necessary (char * arg)
 /* See common-inferior.h.  */
 
 std::string
-construct_inferior_arguments (gdb::array_view<char * const> argv)
+construct_inferior_arguments (gdb::array_view<char * const> argv,
+                              bool escape_args)
 {
   std::string result;
 
@@ -124,8 +125,14 @@ construct_inferior_arguments (gdb::array_view<char * const> argv)
             error (_("can't handle command-line "
                      "argument containing whitespace"));
         }
-
-      result += escape_arg_as_necessary (argv[i]);
+      if (escape_args)
+        {
+          result += escape_arg_as_necessary (argv[i]);
+        }
+      else
+        {
+          result += argv[i];
+        }
     }
 
   return result;
diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h
index 8f104b6c632..db7bf82f08a 100644
--- a/gdbsupport/common-inferior.h
+++ b/gdbsupport/common-inferior.h
@@ -64,9 +64,12 @@ extern bool startup_with_shell;
 extern std::string
 escape_arg_as_necessary (char * arg);
 
-/* Compute command-line string given argument vector. This does the
-   same shell processing as fork_inferior.  */
+/* Compute command-line string given argument vector.
+
+  ESCAPE_ARGS specifies whether the arguments should be escaped for the case
+  that the debuggee is run in a shell.  */
 extern std::string
-construct_inferior_arguments (gdb::array_view<char * const>);
+construct_inferior_arguments (gdb::array_view<char * const>,
+                              bool escape_args = true);
 
 #endif /* COMMON_COMMON_INFERIOR_H */
-- 
2.33.0