RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-14 18:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct variadic prototypes for execl* family

Browse Source 
the old versions worked, but conflicted with programs which declared
their own prototypes and generated warnings with some versions of gcc.
This commit is contained in:
Rich Felker 2011-04-27 16:06:33 -04:00
parent 22263709ed
commit e6bac87d0e
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/unistd.h
View File

@ -81,10 +81,10 @@ int pause(void);
pid_t fork(void); pid_t fork(void);
int execve(const char *, char *const [], char *const []); int execve(const char *, char *const [], char *const []);
int execv(const char *, char *const []); int execv(const char *, char *const []);
int execle(const char *, ...); int execle(const char *, const char *, ...);
int execl(const char *, ...); int execl(const char *, const char *, ...);
int execvp(const char *, char *const []); int execvp(const char *, char *const []);
int execlp(const char *, ...); int execlp(const char *, const char *, ...);
int fexecve(int, char *const [], char *const []); int fexecve(int, char *const [], char *const []);
void _exit(int); void _exit(int);

11
src/process/execl.c
View File

@ -1,18 +1,19 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
int execl(const char *path, ...) int execl(const char *path, const char *argv0, ...)
{ {
int argc; int argc;
va_list ap; va_list ap;
va_start(ap, path); va_start(ap, argv0);
for (argc=0; va_arg(ap, const char *); argc++); for (argc=1; va_arg(ap, const char *); argc++);
va_end(ap); va_end(ap);
{ {
int i; int i;
char *argv[argc+1]; char *argv[argc+1];
va_start(ap, path); va_start(ap, argv0);
for (i=0; i<argc; i++) argv[0] = (char *)argv0;
for (i=1; i<argc; i++)
argv[i] = va_arg(ap, char *); argv[i] = va_arg(ap, char *);
argv[i] = NULL; argv[i] = NULL;
return execv(path, argv); return execv(path, argv);

11
src/process/execle.c
View File

@ -1,19 +1,20 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
int execle(const char *path, ...) int execle(const char *path, const char *argv0, ...)
{ {
int argc; int argc;
va_list ap; va_list ap;
va_start(ap, path); va_start(ap, argv0);
for (argc=0; va_arg(ap, const char *); argc++); for (argc=1; va_arg(ap, const char *); argc++);
va_end(ap); va_end(ap);
{ {
int i; int i;
char *argv[argc+1]; char *argv[argc+1];
char **envp; char **envp;
va_start(ap, path); va_start(ap, argv0);
for (i=0; i<argc; i++) argv[0] = (char *)argv0;
for (i=1; i<argc; i++)
argv[i] = va_arg(ap, char *); argv[i] = va_arg(ap, char *);
argv[i] = NULL; argv[i] = NULL;
envp = va_arg(ap, char **); envp = va_arg(ap, char **);

11
src/process/execlp.c
View File

@ -1,18 +1,19 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
int execlp(const char *file, ...) int execlp(const char *file, const char *argv0, ...)
{ {
int argc; int argc;
va_list ap; va_list ap;
va_start(ap, file); va_start(ap, argv0);
for (argc=0; va_arg(ap, const char *); argc++); for (argc=1; va_arg(ap, const char *); argc++);
va_end(ap); va_end(ap);
{ {
int i; int i;
char *argv[argc+1]; char *argv[argc+1];
va_start(ap, file); va_start(ap, argv0);
for (i=0; i<argc; i++) argv[0] = (char *)argv0;
for (i=1; i<argc; i++)
argv[i] = va_arg(ap, char *); argv[i] = va_arg(ap, char *);
argv[i] = NULL; argv[i] = NULL;
return execvp(file, argv); return execvp(file, argv);