From 2436f20262a41bd1cafa5107ab6d6799c03e0964 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 15 Mar 2011 17:38:48 +0200
Subject: Handle paths with spaces on Windows

---
 odb/odb.cxx | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'odb/odb.cxx')

diff --git a/odb/odb.cxx b/odb/odb.cxx
index 707173e..5dec9e5 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -698,25 +698,6 @@ encode_plugin_option (string const& k, string const& cv)
   if (!v.empty ())
   {
     o += '=';
-
-    // On Windows we need to protect values with spaces using quotes.
-    // Since there could be actual quotes in the value, we need to
-    // escape them.
-    //
-#ifdef _WIN32
-    {
-      string t ("\"");
-      for (size_t i (0); i < v.size (); ++i)
-      {
-        if (v[i] == '"')
-          t += "\\\"";
-        else
-          t += v[i];
-      }
-      t += '"';
-      v = t;
-    }
-#endif
     o += v;
   }
 
@@ -1181,12 +1162,32 @@ start_process (char const* args[], char const* name, bool out)
   // Serialize the arguments to string.
   //
   string cmd_line;
+
   for (char const** p (args); *p != 0; ++p)
   {
     if (p != args)
       cmd_line += ' ';
 
-    cmd_line += *p;
+    // On Windows we need to protect values with spaces using quotes.
+    // Since there could be actual quotes in the value, we need to
+    // escape them.
+    //
+    string a (*p);
+    bool quote (a.find (' ') != string::npos);
+
+    if (quote)
+      cmd_line += '"';
+
+    for (size_t i (0); i < a.size (); ++i)
+    {
+      if (a[i] == '"')
+        cmd_line += "\\\"";
+      else
+        cmd_line += a[i];
+    }
+
+    if (quote)
+      cmd_line += '"';
   }
 
   // Prepare other info.
-- 
cgit v1.1