diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-02-09 23:06:54 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-02-09 23:06:54 +0000 |
| commit | e57fc6bbb2e98f9ef3336db698dc7dd260dfc502 (patch) | |
| tree | d525aa4fb8a13d6459c6339e4543c840b415e636 /libc/stdlib | |
| parent | 56139d5a7109db33a7f3e951595a45a0f7f12cd4 (diff) | |
Use __environ instead of the GNU extension environ.
-Erik
Diffstat (limited to 'libc/stdlib')
| -rw-r--r-- | libc/stdlib/getenv.c | 7 | ||||
| -rw-r--r-- | libc/stdlib/putenv.c | 21 | ||||
| -rw-r--r-- | libc/stdlib/setenv.c | 3 |
3 files changed, 13 insertions, 18 deletions
diff --git a/libc/stdlib/getenv.c b/libc/stdlib/getenv.c index b5d4de9aa..ca50402b9 100644 --- a/libc/stdlib/getenv.c +++ b/libc/stdlib/getenv.c @@ -4,10 +4,9 @@ */ #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <malloc.h> -extern char **environ; - char *getenv(var) const char *var; { @@ -16,10 +15,10 @@ const char *var; len = strlen(var); - if (!environ) + if (!__environ) return 0; - for (p = environ; *p; p++) { + for (p = __environ; *p; p++) { if (memcmp(var, *p, len) == 0 && (*p)[len] == '=') return *p + len + 1; } diff --git a/libc/stdlib/putenv.c b/libc/stdlib/putenv.c index 5b2ebcb3c..5f27e57d7 100644 --- a/libc/stdlib/putenv.c +++ b/libc/stdlib/putenv.c @@ -4,10 +4,9 @@ */ #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <malloc.h> -extern char **environ; - #define ADD_NUM 4 int putenv(var) @@ -25,14 +24,14 @@ const char *var; else len = r - var; - if (!environ) { - environ = (char **) malloc(ADD_NUM * sizeof(char *)); - memset(environ, 0, sizeof(char *) * ADD_NUM); + if (!__environ) { + __environ = (char **) malloc(ADD_NUM * sizeof(char *)); + memset(__environ, 0, sizeof(char *) * ADD_NUM); extras = ADD_NUM; } - for (p = environ; *p; p++) { + for (p = __environ; *p; p++) { if (memcmp(var, *p, len) == 0 && (*p)[len] == '=') { while ((p[0] = p[1])) p++; @@ -43,20 +42,20 @@ const char *var; if (r == 0) return 0; if (extras <= 0) { /* Need more space */ - d = malloc((p - environ + 1 + ADD_NUM) * sizeof(char *)); + d = malloc((p - __environ + 1 + ADD_NUM) * sizeof(char *)); if (d == 0) return -1; - memcpy((void *) d, (void *) environ, + memcpy((void *) d, (void *) __environ, - (p - environ + 1) * sizeof(char *)); - p = d + (p - environ); + (p - __environ + 1) * sizeof(char *)); + p = d + (p - __environ); extras = ADD_NUM; if (mall_env) free(mall_env); - environ = d; + __environ = d; mall_env = d; } *p++ = strdup((char *) var); diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c index 6628e4cc7..a027ced96 100644 --- a/libc/stdlib/setenv.c +++ b/libc/stdlib/setenv.c @@ -21,9 +21,6 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <errno.h> -#if !defined(HAVE_GNU_LD) && !defined (__ELF__) -#define __environ environ -#endif #if defined(_REENTRENT) || defined(_THREAD_SAFE) # include <pthread.h> |