BUG: fix CommandLine test problems with spaces and testing for the return value

2 files changed, 18 insertions, 4 deletions

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3a8e26e..0e0cce8 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -778,16 +778,28 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
     else if (args[1] == "chdir" && args.size() >= 4)
       {
       std::string directory = args[2];
+      unsigned pos = 3;
+      if(!cmSystemTools::FileExists(directory.c_str()))
+        {
+        directory += " ";
+        directory += args[3];
+        if(!cmSystemTools::FileExists(directory.c_str()))
+          {
+          cmSystemTools::Error("Directory does not exist for chdir command (try1): ", args[2].c_str());
+          cmSystemTools::Error("Directory does not exist for chdir command (try2): ", directory.c_str());
+          }
+        pos = 4;
+        }
+      
       std::string command = "\"";
-      command += args[3];
+      command += args[pos];
       command += "\"";
-      for (std::string::size_type cc = 4; cc < args.size(); cc ++)
+      for (std::string::size_type cc = pos+1; cc < args.size(); cc ++)
         {
         command += " \"";
         command += args[cc];
         command += "\"";
         }
-
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval, 
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 932aab9..829d907 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -184,7 +184,9 @@ int do_cmake(int ac, char** av)
       {
       wiz = true;
       }
-    else if (strcmp(av[i], "-E") == 0)
+    // if command has already been set, then
+    // do not eat the -E 
+    else if (!command && strcmp(av[i], "-E") == 0)
       {
       command = true;
       }