From e2e2411f40af9611c3a0c00e21acbf86946b1fd4 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 14 Dec 2004 04:18:51 +0000 Subject: For PR351: Implement the new environment pointer for ExecuteAndWait git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18928 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Program.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'lib/System/Unix/Program.cpp') diff --git a/lib/System/Unix/Program.cpp b/lib/System/Unix/Program.cpp index ae53720d1d..35192ce7be 100644 --- a/lib/System/Unix/Program.cpp +++ b/lib/System/Unix/Program.cpp @@ -79,7 +79,8 @@ Program::FindProgramByName(const std::string& progName) { // int Program::ExecuteAndWait(const Path& path, - const std::vector& args) { + const std::vector& args, + const char ** envp ) { if (!path.executable()) throw path.toString() + " is not executable"; @@ -103,11 +104,15 @@ Program::ExecuteAndWait(const Path& path, break; // Child process: Execute the program. - case 0: - execve (path.c_str(), (char** const)argv, environ); + case 0: { + char** env = environ; + if (envp != 0) + env = (char**) envp; + execve (path.c_str(), (char** const)argv, env); // If the execve() failed, we should exit and let the parent pick up // our non-zero exit status. exit (errno); + } // Parent process: Break out of the switch to do our processing. default: -- cgit v1.2.3-18-g5258