BUG: fix spaces in path on mingw, and change EXEC_PROGRAM to return false when it does not run, also do not convert the directory to an output path for EXEC_PROGRAM as this is done by the process execution, and doing it twice may cause trouble on some shells.

1 files changed, 29 insertions, 1 deletions

diff --git a/Source/cmWin32ProcessExecution.cxx b/Source/cmWin32ProcessExecution.cxx
index ba736db..d06a33c 100644
--- a/Source/cmWin32ProcessExecution.cxx
+++ b/Source/cmWin32ProcessExecution.cxx
@@ -441,9 +441,37 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
     free(s1);
     return TRUE;
     }
-  output += "CreateProcessError ";
+  
+   LPVOID lpMsgBuf;
+
+  FormatMessage( 
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                NULL,
+                GetLastError(),
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL 
+                );
+  
+  // Free the buffer.
+ 
+  char* str = 0;
+  str = strcpy(new char[strlen((char*)lpMsgBuf)+1], (char*)lpMsgBuf); 
+  LocalFree( lpMsgBuf );
+  
+  output += "CreateProcessError: ";
+  output += str;
+  output += "\n";
+  output += "for command: ";
   output += s2;
+  if(path)
+    {
+    output += "\nin dir: ";
+    output += path;
+    }
   output += "\n";
+  delete [] str;
   free(s2);
   free(s1);
   return FALSE;