diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-02-17 14:24:39 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-02-17 14:24:39 -0500 |
| commit | 23ccb80fcb325bd89e40508a57ff4ccedea6926d (patch) | |
| tree | ff3bc4076b971e615c7107cf6827ba694f8ae7ec /src/process/execvp.c | |
| parent | cac872957e8c9e3fc13904c1c55eee0253ec1382 (diff) | |
| download | musl-23ccb80fcb325bd89e40508a57ff4ccedea6926d.tar.gz musl-23ccb80fcb325bd89e40508a57ff4ccedea6926d.tar.xz musl-23ccb80fcb325bd89e40508a57ff4ccedea6926d.zip | |
consistently use the internal name __environ for environ
patch by Jens Gustedt. previously, the intended policy was to use __environ in code that must conform to the ISO C namespace requirements, and environ elsewhere. this policy was not followed in practice anyway, making things confusing. on top of that, Jens reported that certain combinations of link-time optimization options were breaking with the inconsistent references; this seems to be a compiler or linker bug, but having it go away is a nice side effect of the changes made here.
Diffstat (limited to 'src/process/execvp.c')
| -rw-r--r-- | src/process/execvp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process/execvp.c b/src/process/execvp.c index 682680dd..0a33e42d 100644 --- a/src/process/execvp.c +++ b/src/process/execvp.c @@ -4,7 +4,7 @@ #include <errno.h> #include <limits.h> -extern char **environ; +extern char **__environ; int __execvpe(const char *file, char *const argv[], char *const envp[]) { @@ -45,5 +45,5 @@ int __execvpe(const char *file, char *const argv[], char *const envp[]) int execvp(const char *file, char *const argv[]) { - return __execvpe(file, argv, environ); + return __execvpe(file, argv, __environ); } |