2014-06-01 Ray Donnelly <mingw.android@gmail.com>

	* pex-win32.c (argv_to_cmdline): Don't quote
	args unnecessarily.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16eb6f75ef489e36c4f660be54b9a053b09e5150..8390e4c784154bb823b6eb20451e4bfb57915c2b 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-01  Ray Donnelly  <mingw.android@gmail.com>
+
+       * pex-win32.c (argv_to_cmdline): Don't quote
+       args unnecessarily
+
 2014-05-28  Pedro Alves  <palves@redhat.com>
 
        * cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_FUNCTION_PARAM

diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c
index eae72c51dc0a2662db01b16c43abdf20590ac027..8b9d4f04900c5ef556fe6f0a6ce089ae7121e32f 100644 (file)
--- a/libiberty/pex-win32.c
+++ b/libiberty/pex-win32.c
@@ -340,17 +340,25 @@ argv_to_cmdline (char *const *argv)
   char *p;
   size_t cmdline_len;
   int i, j, k;
+  int needs_quotes;
 
   cmdline_len = 0;
   for (i = 0; argv[i]; i++)
     {
-      /* We quote every last argument.  This simplifies the problem;
-        we need only escape embedded double-quotes and immediately
+      /* We only quote arguments that contain spaces, \t or " characters to
+        prevent wasting 2 chars per argument of the CreateProcess 32k char
+        limit.  We need only escape embedded double-quotes and immediately
         preceeding backslash characters.  A sequence of backslach characters
         that is not follwed by a double quote character will not be
         escaped.  */
+      needs_quotes = 0;
       for (j = 0; argv[i][j]; j++)
        {
+         if (argv[i][j] == ' ' || argv[i][j] == '\t' || argv[i][j] == '"')
+           {
+             needs_quotes = 1;
+           }
+
          if (argv[i][j] == '"')
            {
              /* Escape preceeding backslashes.  */
@@ -362,16 +370,33 @@ argv_to_cmdline (char *const *argv)
        }
       /* Trailing backslashes also need to be escaped because they will be
          followed by the terminating quote.  */
-      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
-       cmdline_len++;
+      if (needs_quotes)
+        {
+          for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+            cmdline_len++;
+        }
       cmdline_len += j;
-      cmdline_len += 3;  /* for leading and trailing quotes and space */
+      /* for leading and trailing quotes and space */
+      cmdline_len += needs_quotes * 2 + 1;
     }
   cmdline = XNEWVEC (char, cmdline_len);
   p = cmdline;
   for (i = 0; argv[i]; i++)
     {
-      *p++ = '"';
+      needs_quotes = 0;
+      for (j = 0; argv[i][j]; j++)
+        {
+          if (argv[i][j] == ' ' || argv[i][j] == '\t' || argv[i][j] == '"')
+            {
+              needs_quotes = 1;
+              break;
+            }
+        }
+
+      if (needs_quotes)
+        {
+          *p++ = '"';
+        }
       for (j = 0; argv[i][j]; j++)
        {
          if (argv[i][j] == '"')
@@ -382,9 +407,12 @@ argv_to_cmdline (char *const *argv)
            }
          *p++ = argv[i][j];
        }
-      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
-       *p++ = '\\';
-      *p++ = '"';
+      if (needs_quotes)
+        {
+          for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+            *p++ = '\\';
+          *p++ = '"';
+        }
       *p++ = ' ';
     }
   p[-1] = '\0';