Skip to content

Commit

Permalink
Added execvpe().
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
@axeld
axeld committed Jul 23, 2015
1 parent edade0f commit 34671d6
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 34 deletions.
12 changes: 7 additions & 5 deletions headers/posix/unistd.h
View file
Original file line number Diff line number Diff line change
@@ -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.
*/
#ifndef _UNISTD_H_
Expand Down Expand Up @@ -207,13 +207,15 @@ extern int lockf(int fd, int function, off_t size);
/* process functions */
extern pid_t fork(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 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 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));

Expand Down
65 changes: 36 additions & 29 deletions src/system/libroot/posix/unistd/exec.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2008, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Copyright 2004-2015, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/

Expand All @@ -21,30 +21,30 @@


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;

while (arg != NULL) {
count++;
arg = va_arg(list, const char *);
arg = va_arg(list, const char*);
}

if (_env)
*_env = va_arg(list, char **);
*_env = va_arg(list, char**);

return count;
}


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;

while (arg != NULL) {
args[count++] = arg;
arg = va_arg(list, const char *);
arg = va_arg(list, const char*);
}

args[count] = NULL;
Expand All @@ -53,7 +53,7 @@ copy_arguments(va_list list, const char **args, const char *arg)


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)
{
if (path == NULL || args == NULL) {
Expand Down Expand Up @@ -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') {
status = __parse_invoke_line(invoker, &newArgs, &args, &argCount, path);
if (status < B_OK) {
Expand Down Expand Up @@ -128,25 +128,32 @@ do_exec(const char *path, char * const args[], char * const environment[],


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);
}


int
execv(const char *path, char * const *argv)
execv(const char* path, char* const argv[])
{
return do_exec(path, argv, environ, false);
}


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)
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

Expand Down Expand Up @@ -189,7 +196,7 @@ execvp(const char *file, char* const* argv)

// if executable, execute it
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);
Expand All @@ -198,9 +205,9 @@ execvp(const char *file, char* const* argv)


int
execl(const char *path, const char *arg, ...)
execl(const char* path, const char* arg, ...)
{
const char **args;
const char** args;
va_list list;
int count;

Expand All @@ -212,19 +219,19 @@ execl(const char *path, const char *arg, ...)

// copy arguments

args = (const char**)alloca((count + 1) * sizeof(char *));
args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg);
copy_arguments(list, args, arg);
va_end(list);

return do_exec(path, (char * const *)args, environ, false);
return do_exec(path, (char* const*)args, environ, false);
}


int
execlp(const char *file, const char *arg, ...)
execlp(const char* file, const char* arg, ...)
{
const char **args;
const char** args;
va_list list;
int count;

Expand All @@ -236,20 +243,20 @@ execlp(const char *file, const char *arg, ...)

// copy arguments

args = (const char**)alloca((count + 1) * sizeof(char *));
args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg);
copy_arguments(list, args, arg);
va_end(list);

return execvp(file, (char * const *)args);
return execvp(file, (char* const*)args);
}


int
execle(const char *path, const char *arg, ... /*, char **env */)
execle(const char* path, const char* arg, ... /*, char** env */)
{
const char **args;
char **env;
const char** args;
char** env;
va_list list;
int count;

Expand All @@ -261,19 +268,19 @@ execle(const char *path, const char *arg, ... /*, char **env */)

// copy arguments

args = (const char**)alloca((count + 1) * sizeof(char *));
args = (const char**)alloca((count + 1) * sizeof(char*));
va_start(list, arg);
copy_arguments(list, args, arg);
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
exect(const char *path, char * const *argv)
exect(const char* path, char* const* argv)
{
// ToDo: is this any different?
return execv(path, argv);
}

0 comments on commit 34671d6

Please sign in to comment.