i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added execvpe().

Browse Source 
* This closes #12114 again; while not POSIX, it's just a line away.
* Removed exect() from the header -- not sure where this came from.
  but I can't find anything about it on the net.
* Consolidated use of asterisk style in exec.cpp.
This commit is contained in:
Axel Dörfler
2015-07-23 13:30:30 +02:00
parent edade0f506
commit 34671d601a
2 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/unistd.h
+7 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2011 Haiku, Inc. All Rights Reserved. * Copyright 2004-2015 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _UNISTD_H_ #ifndef _UNISTD_H_
@@ -207,13 +207,15 @@ extern int lockf(int fd, int function, off_t size);
/* process functions */ /* process functions */
extern pid_t fork(void); extern pid_t fork(void);
extern pid_t vfork(void); extern pid_t vfork(void);
extern int execve(const char *path, char * const argv[], char * const envp[]); extern int execve(const char *path, char * const argv[],
char *const environment[]);
extern int execl(const char *path, const char *arg, ...); extern int execl(const char *path, const char *arg, ...);
extern int execv(const char *path, char *const *argv); extern int execv(const char *path, char *const argv[]);
extern int execlp(const char *file, const char *arg, ...); extern int execlp(const char *file, const char *arg, ...);
extern int execle(const char *path, const char *arg , ... /*, char **envp */); extern int execle(const char *path, const char *arg , ... /*, char **envp */);
extern int exect(const char *path, char *const *argv); extern int execvp(const char *file, char *const argv[]);
extern int execvp(const char *file, char *const *argv); extern int execvpe(const char *file, char *const argv[],
char *const environment[]);
extern void _exit(int status) __attribute__ ((noreturn)); extern void _exit(int status) __attribute__ ((noreturn));
src/system/libroot/posix/unistd/exec.cpp
+36 -29
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2008, Ingo Weinhold, [email protected]. * Copyright 2008, Ingo Weinhold, [email protected].
* Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2004-2015, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -21,30 +21,30 @@
static int static int
count_arguments(va_list list, const char *arg, char ***_env) count_arguments(va_list list, const char* arg, char*** _env)
{ {
int count = 0; int count = 0;
while (arg != NULL) { while (arg != NULL) {
count++; count++;
arg = va_arg(list, const char *); arg = va_arg(list, const char*);
} }
if (_env) if (_env)
*_env = va_arg(list, char **); *_env = va_arg(list, char**);
return count; return count;
} }
static void static void
copy_arguments(va_list list, const char **args, const char *arg) copy_arguments(va_list list, const char** args, const char* arg)
{ {
int count = 0; int count = 0;
while (arg != NULL) { while (arg != NULL) {
args[count++] = arg; args[count++] = arg;
arg = va_arg(list, const char *); arg = va_arg(list, const char*);
} }
args[count] = NULL; args[count] = NULL;
@@ -53,7 +53,7 @@ copy_arguments(va_list list, const char **args, const char *arg)
static int static int
do_exec(const char *path, char * const args[], char * const environment[], do_exec(const char* path, char* const args[], char* const environment[],
bool useDefaultInterpreter) bool useDefaultInterpreter)
{ {
if (path == NULL || args == NULL) { if (path == NULL || args == NULL) {
@@ -94,7 +94,7 @@ do_exec(const char *path, char * const args[], char * const environment[],
} }
} }
char **newArgs = NULL; char** newArgs = NULL;
if (invoker[0] != '\0') { if (invoker[0] != '\0') {
status = __parse_invoke_line(invoker, &newArgs, &args, &argCount, path); status = __parse_invoke_line(invoker, &newArgs, &args, &argCount, path);
if (status < B_OK) { if (status < B_OK) {
@@ -128,25 +128,32 @@ do_exec(const char *path, char * const args[], char * const environment[],
int int
execve(const char *path, char* const args[], char* const environment[]) execve(const char* path, char* const args[], char* const environment[])
{ {
return do_exec(path, args, environment, false); return do_exec(path, args, environment, false);
} }
int int
execv(const char *path, char * const *argv) execv(const char* path, char* const argv[])
{ {
return do_exec(path, argv, environ, false); return do_exec(path, argv, environ, false);
} }
int int
execvp(const char *file, char* const* argv) execvp(const char* file, char* const argv[])
{
return execvpe(file, argv, environ);
}
int
execvpe(const char* file, char* const argv[], char* const environment[])
{ {
// let do_exec() handle cases where file is a path (or invalid) // let do_exec() handle cases where file is a path (or invalid)
if (file == NULL || strchr(file, '/') != NULL) if (file == NULL || strchr(file, '/') != NULL)
return do_exec(file, argv, environ, true); return do_exec(file, argv, environment, true);
// file is just a leaf name, so we have to look it up in the path // file is just a leaf name, so we have to look it up in the path
@@ -189,7 +196,7 @@ execvp(const char *file, char* const* argv)
// if executable, execute it // if executable, execute it
if (access(path, X_OK) == 0) if (access(path, X_OK) == 0)
return do_exec(path, argv, environ, true); return do_exec(path, argv, environment, true);
} }
__set_errno(B_ENTRY_NOT_FOUND); __set_errno(B_ENTRY_NOT_FOUND);
@@ -198,9 +205,9 @@ execvp(const char *file, char* const* argv)
int int
execl(const char *path, const char *arg, ...) execl(const char* path, const char* arg, ...)
{ {
const char **args; const char** args;
va_list list; va_list list;
int count; int count;
@@ -212,19 +219,19 @@ execl(const char *path, const char *arg, ...)
// copy arguments // copy arguments
args = (const char**)alloca((count + 1) * sizeof(char *)); args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg); va_start(list, arg);
copy_arguments(list, args, arg); copy_arguments(list, args, arg);
va_end(list); va_end(list);
return do_exec(path, (char * const *)args, environ, false); return do_exec(path, (char* const*)args, environ, false);
} }
int int
execlp(const char *file, const char *arg, ...) execlp(const char* file, const char* arg, ...)
{ {
const char **args; const char** args;
va_list list; va_list list;
int count; int count;
@@ -236,20 +243,20 @@ execlp(const char *file, const char *arg, ...)
// copy arguments // copy arguments
args = (const char**)alloca((count + 1) * sizeof(char *)); args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg); va_start(list, arg);
copy_arguments(list, args, arg); copy_arguments(list, args, arg);
va_end(list); va_end(list);
return execvp(file, (char * const *)args); return execvp(file, (char* const*)args);
} }
int int
execle(const char *path, const char *arg, ... /*, char **env */) execle(const char* path, const char* arg, ... /*, char** env */)
{ {
const char **args; const char** args;
char **env; char** env;
va_list list; va_list list;
int count; int count;
@@ -261,19 +268,19 @@ execle(const char *path, const char *arg, ... /*, char **env */)
// copy arguments // copy arguments
args = (const char**)alloca((count + 1) * sizeof(char *)); args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg); va_start(list, arg);
copy_arguments(list, args, arg); copy_arguments(list, args, arg);
va_end(list); va_end(list);
return do_exec(path, (char * const *)args, env, false); return do_exec(path, (char* const*)args, env, false);
} }
// TODO: remove this again if possible
extern int exect(const char *path, char *const *argv);
int int
exect(const char *path, char * const *argv) exect(const char* path, char* const* argv)
{ {
// ToDo: is this any different?
return execv(path, argv); return execv(path, argv);
} }