nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix prototypes for execl(3), execle(3), and execlp(3).

This commit is contained in:
Jonas 'Sortie' Termansen 2013-10-16 00:29:39 +02:00
parent b9eef9ed5d
commit dd3662e3d0
4 changed files with 88 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libc/execl.cpp
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
This file is part of the Sortix C Library.
@ -23,13 +23,35 @@
*******************************************************************************/
#include <stdarg.h>
#include <stdlib.h>
#include <unistd.h>
extern "C" int execl(const char* pathname, ...)
extern "C" int execl(const char* pathname, const char* argv0, ...)
{
if ( !argv0 )
return execv(pathname, (char* const*) &argv0);
va_list args;
va_start(args, pathname);
int result = vexecl(pathname, args);
va_start(args, argv0);
size_t numargs = 1;
while ( argv0 && va_arg(args, const char*) )
numargs++;
va_end(args);
char** argv = (char**) malloc(sizeof(char*) * (numargs+1));
if ( !argv )
return -1;
argv[0] = (char*) argv0;
va_start(args, argv0);
for ( size_t i = 1; i <= numargs; i++ )
argv[i] = (char*) va_arg(args, const char*);
va_end(args);
argv[numargs] = NULL;
int result = execv(pathname, argv);
free(argv);
return result;
}

37
libc/execle.cpp
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
This file is part of the Sortix C Library.
@ -23,13 +23,42 @@
*******************************************************************************/
#include <stdarg.h>
#include <stdlib.h>
#include <unistd.h>
extern "C" int execle(const char* pathname, ...)
extern "C" int execle(const char* pathname, const char* argv0, ...)
{
if ( !argv0 )
{
va_list args;
va_start(args, argv0);
char* const* envp = va_arg(args, char* const*);
va_end(args);
return execve(pathname, (char* const*) &argv0, envp);
}
va_list args;
va_start(args, pathname);
int result = vexecle(pathname, args);
va_start(args, argv0);
size_t numargs = 1;
while ( argv0 && va_arg(args, const char*) )
numargs++;
va_end(args);
char** argv = (char**) malloc(sizeof(char*) * (numargs+1));
if ( !argv )
return -1;
argv[0] = (char*) argv0;
va_start(args, argv0);
for ( size_t i = 1; i <= numargs; i++ )
argv[i] = (char*) va_arg(args, const char*);
char* const* envp = va_arg(args, char* const*);
va_end(args);
argv[numargs] = NULL;
int result = execve(pathname, argv, envp);
free(argv);
return result;
}

30
libc/execlp.cpp
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
This file is part of the Sortix C Library.
@ -23,13 +23,35 @@
*******************************************************************************/
#include <stdarg.h>
#include <stdlib.h>
#include <unistd.h>
extern "C" int execlp(const char* filename, ...)
extern "C" int execlp(const char* filename, const char* argv0, ...)
{
if ( !argv0 )
return execvp(filename, (char* const*) &argv0);
va_list args;
va_start(args, filename);
int result = vexeclp(filename, args);
va_start(args, argv0);
size_t numargs = 1;
while ( argv0 && va_arg(args, const char*) )
numargs++;
va_end(args);
char** argv = (char**) malloc(sizeof(char*) * (numargs+1));
if ( !argv )
return -1;
argv[0] = (char*) argv0;
va_start(args, argv0);
for ( size_t i = 1; i <= numargs; i++ )
argv[i] = (char*) va_arg(args, const char*);
va_end(args);
argv[numargs] = NULL;
int result = execvp(filename, argv);
free(argv);
return result;
}

6
libc/include/unistd.h
View File

@ -156,9 +156,9 @@ int chdir(const char*);
int close(int);
int dup(int);
void _exit(int) __attribute__ ((noreturn));
int execl(const char*, ...);
int execle(const char*, ...);
int execlp(const char*, ...);
int execl(const char*, const char*, ...);
int execle(const char*, const char*, ...);
int execlp(const char*, const char*, ...);
int execv(const char*, char* const []);
int execve(const char*, char* const [], char* const []);
int execvp(const char*, char* const []);