maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In ExecWait(), made the child process exit if it can't execve() the new 

program.
Added the use of const (which compiles and is hopefully correct).
Added comments.

llvm-svn: 8585
This commit is contained in:
John Criswell 2003-09-17 19:02:49 +00:00
parent a3fc5d9a35
commit 74c89470d3
3 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/Support/SystemUtils.h
View File

@ -41,5 +41,5 @@ int RunProgramWithTimeout(const std::string &ProgramPath, const char **Args,
/// Execute a program with the given arguments and environment and
/// wait for it to terminate.
///
int ExecWait (char ** argv, char ** envp);
int ExecWait (const char * const argv[], const char * const envp[]);
#endif

36
llvm/lib/Support/SystemUtils.cpp
View File

@ -192,8 +192,10 @@ int RunProgramWithTimeout(const std::string &ProgramPath, const char **Args,
// a generic library function. The caller or executed program should report
// errors in the way it sees fit.
//
// This function does not use $PATH to find programs.
//
int
ExecWait (char ** argv, char **envp)
ExecWait (const char * const old_argv[], const char * const old_envp[])
{
// Child process ID
register int child;
@ -202,32 +204,40 @@ ExecWait (char ** argv, char **envp)
int status;
//
// Because UNIX is sometimes less than convenient, we need to use
// FindExecutable() to find the full pathname to the file to execute.
// Create local versions of the parameters that can be passed into execve()
// without creating const problems.
//
// This is becausse execvp() doesn't use PATH, and we want to look for
// programs in the LLVM binary directory first anyway.
//
std::string Program = FindExecutable (argv[0], "");
if (Program.empty())
{
return 1;
}
char ** const argv = (char ** const) old_argv;
char ** const envp = (char ** const) old_envp;
//
// Create a child process.
//
switch (child=fork())
{
//
// An error occured: Return to the caller.
//
case -1:
return 1;
break;
//
// Child process: Execute the program.
//
case 0:
execve (Program.c_str(), argv, envp);
return 1;
execve (argv[0], argv, envp);
//
// If the execve() failed, we should exit and let the parent pick up
// our non-zero exit status.
//
exit (1);
break;
//
// Parent process: Break out of the switch to do our processing.
//
default:
break;
}

36
llvm/support/lib/Support/SystemUtils.cpp
View File

@ -192,8 +192,10 @@ int RunProgramWithTimeout(const std::string &ProgramPath, const char **Args,
// a generic library function. The caller or executed program should report
// errors in the way it sees fit.
//
// This function does not use $PATH to find programs.
//
int
ExecWait (char ** argv, char **envp)
ExecWait (const char * const old_argv[], const char * const old_envp[])
{
// Child process ID
register int child;
@ -202,32 +204,40 @@ ExecWait (char ** argv, char **envp)
int status;
//
// Because UNIX is sometimes less than convenient, we need to use
// FindExecutable() to find the full pathname to the file to execute.
// Create local versions of the parameters that can be passed into execve()
// without creating const problems.
//
// This is becausse execvp() doesn't use PATH, and we want to look for
// programs in the LLVM binary directory first anyway.
//
std::string Program = FindExecutable (argv[0], "");
if (Program.empty())
{
return 1;
}
char ** const argv = (char ** const) old_argv;
char ** const envp = (char ** const) old_envp;
//
// Create a child process.
//
switch (child=fork())
{
//
// An error occured: Return to the caller.
//
case -1:
return 1;
break;
//
// Child process: Execute the program.
//
case 0:
execve (Program.c_str(), argv, envp);
return 1;
execve (argv[0], argv, envp);
//
// If the execve() failed, we should exit and let the parent pick up
// our non-zero exit status.
//
exit (1);
break;
//
// Parent process: Break out of the switch to do our processing.
//
default:
break;
}