diff options
-rw-r--r-- | include/unistd.h | 6 | ||||
-rw-r--r-- | src/process/execl.c | 11 | ||||
-rw-r--r-- | src/process/execle.c | 11 | ||||
-rw-r--r-- | src/process/execlp.c | 11 |
4 files changed, 21 insertions, 18 deletions
diff --git a/include/unistd.h b/include/unistd.h index 05180de0..a64d99b7 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -81,10 +81,10 @@ int pause(void); pid_t fork(void); int execve(const char *, char *const [], char *const []); int execv(const char *, char *const []); -int execle(const char *, ...); -int execl(const char *, ...); +int execle(const char *, const char *, ...); +int execl(const char *, const char *, ...); int execvp(const char *, char *const []); -int execlp(const char *, ...); +int execlp(const char *, const char *, ...); int fexecve(int, char *const [], char *const []); void _exit(int); diff --git a/src/process/execl.c b/src/process/execl.c index 4c6eaa94..327d78b2 100644 --- a/src/process/execl.c +++ b/src/process/execl.c @@ -1,18 +1,19 @@ #include <unistd.h> #include <stdarg.h> -int execl(const char *path, ...) +int execl(const char *path, const char *argv0, ...) { int argc; va_list ap; - va_start(ap, path); - for (argc=0; va_arg(ap, const char *); argc++); + va_start(ap, argv0); + for (argc=1; va_arg(ap, const char *); argc++); va_end(ap); { int i; char *argv[argc+1]; - va_start(ap, path); - for (i=0; i<argc; i++) + va_start(ap, argv0); + argv[0] = (char *)argv0; + for (i=1; i<argc; i++) argv[i] = va_arg(ap, char *); argv[i] = NULL; return execv(path, argv); diff --git a/src/process/execle.c b/src/process/execle.c index 37f629d9..64908366 100644 --- a/src/process/execle.c +++ b/src/process/execle.c @@ -1,19 +1,20 @@ #include <unistd.h> #include <stdarg.h> -int execle(const char *path, ...) +int execle(const char *path, const char *argv0, ...) { int argc; va_list ap; - va_start(ap, path); - for (argc=0; va_arg(ap, const char *); argc++); + va_start(ap, argv0); + for (argc=1; va_arg(ap, const char *); argc++); va_end(ap); { int i; char *argv[argc+1]; char **envp; - va_start(ap, path); - for (i=0; i<argc; i++) + va_start(ap, argv0); + argv[0] = (char *)argv0; + for (i=1; i<argc; i++) argv[i] = va_arg(ap, char *); argv[i] = NULL; envp = va_arg(ap, char **); diff --git a/src/process/execlp.c b/src/process/execlp.c index 33fb0f7f..c7b3f513 100644 --- a/src/process/execlp.c +++ b/src/process/execlp.c @@ -1,18 +1,19 @@ #include <unistd.h> #include <stdarg.h> -int execlp(const char *file, ...) +int execlp(const char *file, const char *argv0, ...) { int argc; va_list ap; - va_start(ap, file); - for (argc=0; va_arg(ap, const char *); argc++); + va_start(ap, argv0); + for (argc=1; va_arg(ap, const char *); argc++); va_end(ap); { int i; char *argv[argc+1]; - va_start(ap, file); - for (i=0; i<argc; i++) + va_start(ap, argv0); + argv[0] = (char *)argv0; + for (i=1; i<argc; i++) argv[i] = va_arg(ap, char *); argv[i] = NULL; return execvp(file, argv); |