PR26132, ar creates invalid libraries for some targets with plugins enabled

[deliverable/binutils-gdb.git] / gdbsupport / common-inferior.cc

diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
index a7d631f3574d64aacd171eaf594a94b1625ceb45..a67d1740a27d78f13c31b1b9658c96d5cdf7ca30 100644 (file)
--- a/gdbsupport/common-inferior.cc
+++ b/gdbsupport/common-inferior.cc
@@ -27,15 +27,10 @@ bool startup_with_shell = true;
 
 /* See common-inferior.h.  */
 
-char *
-construct_inferior_arguments (int argc, char **argv)
+std::string
+construct_inferior_arguments (gdb::array_view<char * const> argv)
 {
-  char *result;
-
-  /* ARGC should always be at least 1, but we double check this
-     here.  This is also needed to silence -Werror-stringop
-     warnings.  */
-  gdb_assert (argc > 0);
+  std::string result;
 
   if (startup_with_shell)
     {
@@ -51,49 +46,38 @@ construct_inferior_arguments (int argc, char **argv)
       static const char special[] = "\"!#$&*()\\|[]{}<>?'`~^; \t\n";
       static const char quote = '\'';
 #endif
-      int i;
-      int length = 0;
-      char *out, *cp;
-
-      /* We over-compute the size.  It shouldn't matter.  */
-      for (i = 0; i < argc; ++i)
-       length += 3 * strlen (argv[i]) + 1 + 2 * (argv[i][0] == '\0');
-
-      result = (char *) xmalloc (length);
-      out = result;
-
-      for (i = 0; i < argc; ++i)
+      for (int i = 0; i < argv.size (); ++i)
        {
          if (i > 0)
-           *out++ = ' ';
+           result += ' ';
 
          /* Need to handle empty arguments specially.  */
          if (argv[i][0] == '\0')
            {
-             *out++ = quote;
-             *out++ = quote;
+             result += quote;
+             result += quote;
            }
          else
            {
 #ifdef __MINGW32__
-             int quoted = 0;
+             bool quoted = false;
 
              if (strpbrk (argv[i], special))
                {
-                 quoted = 1;
-                 *out++ = quote;
+                 quoted = true;
+                 result += quote;
                }
 #endif
-             for (cp = argv[i]; *cp; ++cp)
+             for (char *cp = argv[i]; *cp; ++cp)
                {
                  if (*cp == '\n')
                    {
                      /* A newline cannot be quoted with a backslash (it
                         just disappears), only by putting it inside
                         quotes.  */
-                     *out++ = quote;
-                     *out++ = '\n';
-                     *out++ = quote;
+                     result += quote;
+                     result += '\n';
+                     result += quote;
                    }
                  else
                    {
@@ -102,45 +86,38 @@ construct_inferior_arguments (int argc, char **argv)
 #else
                      if (strchr (special, *cp) != NULL)
 #endif
-                       *out++ = '\\';
-                     *out++ = *cp;
+                       result += '\\';
+                     result += *cp;
                    }
                }
 #ifdef __MINGW32__
              if (quoted)
-               *out++ = quote;
+               result += quote;
 #endif
            }
        }
-      *out = '\0';
     }
   else
     {
       /* In this case we can't handle arguments that contain spaces,
         tabs, or newlines -- see breakup_args().  */
-      int i;
-      int length = 0;
-
-      for (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"));
-         length += strlen (argv[i]) + 1;
        }
 
-      result = (char *) xmalloc (length);
-      result[0] = '\0';
-      for (i = 0; i < argc; ++i)
+      for (int i = 0; i < argv.size (); ++i)
        {
          if (i > 0)
-           strcat (result, " ");
-         strcat (result, argv[i]);
+           result += " ";
+         result += argv[i];
        }
     }