Libc-1044.40.1.tar.gz

[apple/libc.git] / stdlib / FreeBSD / getenv.c

diff --git a/stdlib/FreeBSD/getenv.c b/stdlib/FreeBSD/getenv.c
index aa159892652406935dd6801eb2c71d2ff2fb26a0..47b60dfab1c9f9a56de038c3c16c14bf1998b1ba 100644 (file)
--- a/stdlib/FreeBSD/getenv.c
+++ b/stdlib/FreeBSD/getenv.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,13 +31,14 @@
 static char sccsid[] = "@(#)getenv.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.8 2007/05/01 16:02:41 ache Exp $");
 
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#include <crt_externs.h>
 
-inline char *__findenv(const char *, int *);
+__private_extern__ char *__findenv(const char *, int *, char **);
 
 /*
  * __findenv --
@@ -52,12 +49,12 @@ inline char *__findenv(const char *, int *);
  *
  *     This routine *should* be a static; don't use it.
  */
-inline char *
-__findenv(name, offset)
+__private_extern__ char *
+__findenv(name, offset, environ)
        const char *name;
        int *offset;
+       char **environ;
 {
-       extern char **environ;
        int len, i;
        const char *np;
        char **p, *cp;
@@ -79,6 +76,19 @@ __findenv(name, offset)
        return (NULL);
 }
 
+/*
+ * _getenvp -- SPI using an arbitrary pointer to string array (the array must
+ * have been created with malloc) and an env state, created by _allocenvstate().
+ *     Returns ptr to value associated with name, if any, else NULL.
+ */
+char *
+_getenvp(const char *name, char ***envp, void *state __unused)
+{
+       int offset;
+
+       return (__findenv(name, &offset, *envp));
+}
+
 /*
  * getenv --
  *     Returns ptr to value associated with name, if any, else NULL.
@@ -89,5 +99,5 @@ getenv(name)
 {
        int offset;
 
-       return (__findenv(name, &offset));
+       return (__findenv(name, &offset, *_NSGetEnviron()));
 }