mass elimination of reliance on automatic iterator dereferencing

[oota-llvm.git] / lib / System / Program.cpp

diff --git a/lib/System/Program.cpp b/lib/System/Program.cpp
index c1dd38f6fca6157dbcbfccadcf482b2389a33711..cd58c2cc578cb27c298613c1fc1456db3f9dcf79 100644 (file)
--- a/lib/System/Program.cpp
+++ b/lib/System/Program.cpp
@@ -1,10 +1,10 @@
 //===-- Program.cpp - Implement OS Program Concept --------------*- C++ -*-===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
 //  This header file implements the operating system Program concept.
@@ -12,18 +12,45 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/System/Program.h"
-
-namespace llvm {
+#include "llvm/Config/config.h"
+using namespace llvm;
 using namespace sys;
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only TRULY operating system
-//===          independent code. 
+//===          independent code.
 //===----------------------------------------------------------------------===//
 
+int
+Program::ExecuteAndWait(const Path& path,
+                        const char** args,
+                        const char** envp,
+                        const Path** redirects,
+                        unsigned secondsToWait,
+                        unsigned memoryLimit,
+                        std::string* ErrMsg) {
+  Program prg;
+  if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg))
+    return prg.Wait(secondsToWait, ErrMsg);
+  else
+    return -1;
 }
 
-// Include the platform-specific parts of this class.
-#include "platform/Program.cpp"
+void
+Program::ExecuteNoWait(const Path& path,
+                       const char** args,
+                       const char** envp,
+                       const Path** redirects,
+                       unsigned memoryLimit,
+                       std::string* ErrMsg) {
+  Program prg;
+  prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg);
+}
 
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
+// Include the platform-specific parts of this class.
+#ifdef LLVM_ON_UNIX
+#include "Unix/Program.inc"
+#endif
+#ifdef LLVM_ON_WIN32
+#include "Win32/Program.inc"
+#endif