From 9abc2a984c1c5e5021363faac076e4e5d61d50c8 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 12 Feb 2007 23:53:34 +0000
Subject: [PATCH] Fixed an error on linux. The quotes around the path names now
 only occur in strings that will be processed by shells. The shells will strip
 the double quotes.

---
 Cantera/src/ct2ctml.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Cantera/src/ct2ctml.cpp b/Cantera/src/ct2ctml.cpp
index ee41bd163..479bf1d3e 100644
--- a/Cantera/src/ct2ctml.cpp
+++ b/Cantera/src/ct2ctml.cpp
@@ -39,10 +39,7 @@ namespace ctml {
         if (py) {
             string sp = stripws(string(py));
             if (sp.size() > 0) {
-                if (s.find(' ') != std::string::npos) 
-                    s = "\"" + sp + "\"";
-                else
-                    s = sp;
+              s = sp;
             }
         }
         return s;
@@ -64,7 +61,7 @@ namespace ctml {
         time_t aclock;
         time( &aclock );
         int ia = static_cast<int>(aclock);
-        string path = "\"" + tmpDir()+"/.cttmp"+int2str(ia)+".pyw"+"\"";
+        string path =  tmpDir()+"/.cttmp"+int2str(ia)+".pyw";
         ofstream f(path.c_str());
         if (!f) {
             throw CanteraError("ct2ctml","cannot open "+path+" for writing.");
@@ -80,10 +77,10 @@ namespace ctml {
           << "write()\n";
         f.close();
 #ifdef WIN32
-        string cmd = pypath() + " " + path + "> ct2ctml.log 2>&1";
+        string cmd = pypath() + " " + "\"" + path + "\"" + "> ct2ctml.log 2>&1";
 #else
-        string cmd = "sleep " + sleep() + "; " + pypath() + 
-                     " " + path + " &> ct2ctml.log";
+        string cmd = "sleep " + sleep() + "; " + "\"" + pypath() + "\"" + 
+                     " " + "\"" + path + "\"" + " &> ct2ctml.log";
 #endif
 #ifdef DEBUG_PATHS
         writelog("ct2ctml: executing the command " + cmd + "\n");
@@ -160,7 +157,7 @@ namespace ctml {
         //cmd = "cmd /C rm " + path;
         remove(path.c_str()) ;
 #else
-        cmd = "rm -f " + path;
+        cmd = "rm -f \"" + path + "\"";
         try {
             if (ierr == 0) 
                 system(cmd.c_str());