Libc-825.25.tar.gz

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

diff --git a/stdlib/FreeBSD/getenv.c b/stdlib/FreeBSD/getenv.c
index b1e034a3ff8aadee38a4d4ecc384f8d2f28f1f8b..47b60dfab1c9f9a56de038c3c16c14bf1998b1ba 100644 (file)
--- a/stdlib/FreeBSD/getenv.c
+++ b/stdlib/FreeBSD/getenv.c
@@ -36,8 +36,9 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.8 2007/05/01 16:02:41 ache
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #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 --
 
 /*
  * __findenv --


@@ -48,12 +49,12 @@ inline char *__findenv(const char *, int *);
  *
  *     This routine *should* be a static; don't use it.
  */
  *
  *     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;
        const char *name;
        int *offset;

+       char **environ;

 {
 {

-       extern char **environ;

        int len, i;
        const char *np;
        char **p, *cp;
        int len, i;
        const char *np;
        char **p, *cp;


@@ -75,6 +76,19 @@ __findenv(name, offset)
        return (NULL);
 }
 
        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.
 /*
  * getenv --
  *     Returns ptr to value associated with name, if any, else NULL.


@@ -85,5 +99,5 @@ getenv(name)
 {
        int offset;
 
 {
        int offset;
 

-       return (__findenv(name, &offset));
+       return (__findenv(name, &offset, *_NSGetEnviron()));

 }
 }