Libc-1353.100.2.tar.gz

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

diff --git a/stdlib/FreeBSD/putenv.c b/stdlib/FreeBSD/putenv.c
index e74d34657b50908f7b8e36137024cb23c8ffea1d..6458d6306ee66b21b3d999ac07a31f84b9440f6d 100644 (file)
--- a/stdlib/FreeBSD/putenv.c
+++ b/stdlib/FreeBSD/putenv.c
@@ -35,22 +35,75 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/putenv.c,v 1.6 2007/05/01 16:02:41 ache
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

+#include <sys/types.h>
+#include <db.h>
+#include <crt_externs.h>
+#include <errno.h> 
+
+extern struct owned_ptr *__env_owned;
+
+#ifdef LEGACY_CRT1_ENVIRON
+extern char **_saved_environ;
+#endif /* LEGACY_CRT1_ENVIRON */
+
+__private_extern__ int __init__env_owned_locked(int);
+__private_extern__ int __setenv_locked(const char *, const char *, int, int, char ***, struct owned_ptr *);
+__private_extern__ void __environ_lock(void);
+__private_extern__ void __environ_unlock(void);
+
+#ifndef BUILDING_VARIANT
+/*
+ * _putenvp -- 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.
+ */
+int
+_putenvp(char *str, char ***envp, void *state)
+{
+       __environ_lock();
+       if (__init__env_owned_locked(1)) {
+               __environ_unlock();
+               return (-1);
+       }
+       int ret = __setenv_locked(str, NULL, 1, 0, envp,
+                       (state ? (struct owned_ptr *)state : __env_owned));
+       __environ_unlock();
+       return ret;
+}
+#endif /* BUILDING_VARIANT */

 
 int
 putenv(str)
 
 int
 putenv(str)

-       const char *str;
+       char *str;

 {
 {

-       char *p, *equal;
-       int rval;
+       int ret;
+       int copy;

 
 

-       if ((p = strdup(str)) == NULL)
+#if __DARWIN_UNIX03
+       if (str == NULL || *str == 0 || index(str, '=') == NULL) {
+               errno = EINVAL;

                return (-1);
                return (-1);

-       if ((equal = index(p, '=')) == NULL) {
-               (void)free(p);
+       }
+#else /* !__DARWIN_UNIX03 */
+       if (index(str, '=') == NULL)
+               return (-1);
+#endif /* __DARWIN_UNIX03 */
+
+#if __DARWIN_UNIX03
+       copy = 0;
+#else /* !__DARWIN_UNIX03 */
+       copy = -1;
+#endif /* __DARWIN_UNIX03 */
+
+       __environ_lock();
+       if (__init__env_owned_locked(1)) {
+               __environ_unlock();

                return (-1);
        }
                return (-1);
        }

-       *equal = '\0';
-       rval = setenv(p, equal + 1, 1);
-       (void)free(p);
-       return (rval);
+       ret = __setenv_locked(str, NULL, 1, copy, _NSGetEnviron(), __env_owned);
+#ifdef LEGACY_CRT1_ENVIRON
+       _saved_environ = *_NSGetEnviron();
+#endif /* LEGACY_CRT1_ENVIRON */
+       __environ_unlock();
+       return ret;

 }
 }