From ad971ff354cbc27bc967676c6460729ee1458c52 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 21 May 2015 23:05:57 +0100 Subject: [PATCH] execv: pedantic corrections to prototypes --- Library/include/syscalls.h | 2 +- Library/include/unistd.h | 8 ++++---- Library/libs/execv.c | 2 +- Library/libs/execvp.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/include/syscalls.h b/Library/include/syscalls.h index 292f919a..e05bd7db 100644 --- a/Library/include/syscalls.h +++ b/Library/include/syscalls.h @@ -110,7 +110,7 @@ extern pid_t getpid(void); extern pid_t getppid(void); extern uid_t getuid(void); extern mode_t umask(mode_t); -extern int execve(const char *path, const char *argv[], const char *envp[]); +extern int execve(const char *path, char * const argv[], char *const envp[]); extern pid_t wait(int *status); extern int setuid(uid_t uid); extern int setgid(gid_t gid); diff --git a/Library/include/unistd.h b/Library/include/unistd.h index 7ab84fcf..0f383a73 100644 --- a/Library/include/unistd.h +++ b/Library/include/unistd.h @@ -32,10 +32,10 @@ extern int execl __P((const char *pathname, const char *arg0, ...)); extern int execle __P((const char *pathname, const char *arg0, ...)); extern int execlp __P((const char *pathname, const char *arg0, ...)); extern int execlpe __P((const char *pathname, const char *arg0, ...)); -extern int execv __P((const char *pathname, const char *argv[])); -extern int execve __P((const char *pathname, const char *argv[], const char *envp[])); -extern int execvp __P((const char *pathname, const char *argv[])); -extern int execvpe __P((const char *pathname, const char *argv[], const char *envp[])); +extern int execv __P((const char *pathname, char *const argv[])); +extern int execve __P((const char *pathname, char * const argv[], char * const envp[])); +extern int execvp __P((const char *pathname, char *const argv[])); +extern int execvpe __P((const char *pathname, char *const argv[], char * const envp[])); extern char *ttyname __P((int)); extern int system __P((const char *)); diff --git a/Library/libs/execv.c b/Library/libs/execv.c index c9185de5..3ae356c1 100644 --- a/Library/libs/execv.c +++ b/Library/libs/execv.c @@ -7,7 +7,7 @@ #include #include -int execv(const char *pathP, const char *argv[]) +int execv(const char *pathP, char * const argv[]) { return execve(pathP, argv, (void *)environ); } diff --git a/Library/libs/execvp.c b/Library/libs/execvp.c index 2925f9cf..8c7ff1bc 100644 --- a/Library/libs/execvp.c +++ b/Library/libs/execvp.c @@ -7,7 +7,7 @@ #include #include -int execvp(const char *pathP, const char *argv[]) +int execvp(const char *pathP, char *const argv[]) { return execve(_findPath(pathP), argv, (void *)environ); } -- 2.34.1