GetDLLSuffix: Remove the leading dot from LTDL_SHLIB_EXT.

[oota-llvm.git] / lib / System / Unix / Program.inc

diff --git a/lib/System/Unix/Program.inc b/lib/System/Unix/Program.inc
index 76012afcbaa3257b21bdf6bd935127584bcfa3de..e06f80ba83306e6f9f2b5bd60f7f3cef74cac9ff 100644 (file)
--- a/lib/System/Unix/Program.inc
+++ b/lib/System/Unix/Program.inc
@@ -66,8 +66,8 @@ Program::FindProgramByName(const std::string& progName) {
   if (progName.find('/') != std::string::npos)
     return temp;
 
-  // At this point, the file name does not contain slashes. Search for it
-  // through the directories specified in the PATH environment variable.
+  // At this point, the file name is valid and does not contain slashes. Search
+  // for it through the directories specified in the PATH environment variable.
 
   // Get the path. If its empty, we can't do anything to find it.
   const char *PathStr = getenv("PATH");
@@ -228,12 +228,6 @@ Program::Execute(const Path &path, const char **args, const char **envp,
   }
 #endif
 
-  if (!path.canExecute()) {
-    if (ErrMsg)
-      *ErrMsg = path.str() + " is not executable";
-    return false;
-  }
-
   // Create a child process.
   int child = fork();
   switch (child) {
@@ -297,7 +291,8 @@ Program::Execute(const Path &path, const char **args, const char **envp,
 }
 
 int
-Program::Wait(unsigned secondsToWait,
+Program::Wait(const sys::Path &path,
+              unsigned secondsToWait,
               std::string* ErrMsg)
 {
 #ifdef HAVE_SYS_WAIT_H
@@ -355,25 +350,38 @@ Program::Wait(unsigned secondsToWait,
   int result = 0;
   if (WIFEXITED(status)) {
     result = WEXITSTATUS(status);
+#ifdef HAVE_POSIX_SPAWN
+    // The posix_spawn child process returns 127 on any kind of error.
+    // Following the POSIX convention for command-line tools (which posix_spawn
+    // itself apparently does not), check to see if the failure was due to some
+    // reason other than the file not existing, and return 126 in this case.
+    if (result == 127 && path.exists())
+      result = 126;
+#endif
     if (result == 127) {
-      *ErrMsg = llvm::sys::StrError(ENOENT);
+      if (ErrMsg)
+        *ErrMsg = llvm::sys::StrError(ENOENT);
       return -1;
     }
     if (result == 126) {
-      *ErrMsg = "Program could not be executed";
+      if (ErrMsg)
+        *ErrMsg = "Program could not be executed";
       return -1;
     }
   } else if (WIFSIGNALED(status)) {
-    *ErrMsg = strsignal(WTERMSIG(status));
+    if (ErrMsg) {
+      *ErrMsg = strsignal(WTERMSIG(status));
 #ifdef WCOREDUMP
-    if (WCOREDUMP(status))
-      *ErrMsg += " (core dumped)";
+      if (WCOREDUMP(status))
+        *ErrMsg += " (core dumped)";
 #endif
+    }
     return -1;
   }
   return result;
 #else
-  *ErrMsg = "Program::Wait is not implemented on this platform yet!";
+  if (ErrMsg)
+    *ErrMsg = "Program::Wait is not implemented on this platform yet!";
   return -1;
 #endif
 }