oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Formalize the simple_exec*() API

Browse Source
This commit is contained in:
Asanka Herath
2009-08-26 14:43:32 -04:00
committed by Love Hornquist Astrand
parent 7ee1695f12
commit 49b261efdc
3 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/roken/simple_exec.c
+13 -13
View File
@@ -52,13 +52,13 @@
#define EX_NOTFOUND 127
/* return values:
-1 on `unspecified' system errors
-2 on fork failures
-3 on waitpid errors
-4 exec timeout
SE_E_UNSPECIFIED on `unspecified' system errors
SE_E_FORKFAILED on fork failures
SE_E_WAITPIDFAILED on waitpid errors
SE_E_EXECTIMEOUT exec timeout
0- is return value from subprocess
126 if the program couldn't be executed
127 if the program couldn't be found
SE_E_NOEXEC if the program couldn't be executed
SE_E_NOTFOUND if the program couldn't be found
128- is 128 + signal that killed subprocess
possible values `func' can return:
@@ -98,7 +98,7 @@ wait_for_process_timed(pid_t pid, time_t (*func)(void *),
while(waitpid(pid, &status, 0) < 0) {
if (errno != EINTR) {
ret = -3;
ret = SE_E_WAITPIDFAILED;
goto out;
}
if (func == NULL)
@@ -110,7 +110,7 @@ wait_for_process_timed(pid_t pid, time_t (*func)(void *),
kill(pid, SIGTERM);
continue;
} else if (timeout == (time_t)-2) {
ret = -4;
ret = SE_E_EXECTIMEOUT;
goto out;
}
alarm(timeout);
@@ -211,7 +211,7 @@ pipe_execv(FILE **stdin_fd, FILE **stdout_fd, FILE **stderr_fd,
close(err_fd[0]);
close(err_fd[1]);
}
return -2;
return SE_E_FORKFAILED;
default:
if(stdin_fd != NULL) {
close(in_fd[0]);
@@ -236,7 +236,7 @@ simple_execvp_timed(const char *file, char *const args[],
pid_t pid = fork();
switch(pid){
case -1:
return -2;
return SE_E_FORKFAILED;
case 0:
execvp(file, args);
exit((errno == ENOENT) ? EX_NOTFOUND : EX_NOEXEC);
@@ -259,7 +259,7 @@ simple_execve_timed(const char *file, char *const args[], char *const envp[],
pid_t pid = fork();
switch(pid){
case -1:
return -2;
return SE_E_FORKFAILED;
case 0:
execve(file, args, envp);
exit((errno == ENOENT) ? EX_NOTFOUND : EX_NOEXEC);
@@ -285,7 +285,7 @@ simple_execlp(const char *file, ...)
argv = vstrcollect(&ap);
va_end(ap);
if(argv == NULL)
return -1;
return SE_E_UNSPECIFIED;
ret = simple_execvp(file, argv);
free(argv);
return ret;
@@ -304,7 +304,7 @@ simple_execle(const char *file, ... /* ,char *const envp[] */)
envp = va_arg(ap, char **);
va_end(ap);
if(argv == NULL)
return -1;
return SE_E_UNSPECIFIED;
ret = simple_execve(file, argv, envp);
free(argv);
return ret;