Loading...
--- Libc/Libc-1725.40.4/stdlib/FreeBSD/putenv.c
+++ Libc/Libc-763.12/stdlib/FreeBSD/putenv.c
@@ -35,74 +35,22 @@
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
-#include <db.h>
-#include <crt_externs.h>
-#include <errno.h>
-#include "libc_private.h"
+int
+putenv(str)
+ const char *str;
+{
+ char *p, *equal;
+ int rval;
-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 *);
-
-#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_np();
- if (__init__env_owned_locked(1)) {
- environ_unlock_np();
+ if ((p = strdup(str)) == NULL)
+ return (-1);
+ if ((equal = index(p, '=')) == NULL) {
+ (void)free(p);
return (-1);
}
- int ret = __setenv_locked(str, NULL, 1, 0, envp,
- (state ? (struct owned_ptr *)state : __env_owned));
- environ_unlock_np();
- return ret;
+ *equal = '\0';
+ rval = setenv(p, equal + 1, 1);
+ (void)free(p);
+ return (rval);
}
-#endif /* BUILDING_VARIANT */
-
-int
-putenv(char *str)
-{
- int ret;
- int copy;
-
-#if __DARWIN_UNIX03
- if (str == NULL || *str == 0 || index(str, '=') == NULL) {
- errno = EINVAL;
- return (-1);
- }
-#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_np();
- if (__init__env_owned_locked(1)) {
- environ_unlock_np();
- return (-1);
- }
- ret = __setenv_locked(str, NULL, 1, copy, _NSGetEnviron(), __env_owned);
-#ifdef LEGACY_CRT1_ENVIRON
- _saved_environ = *_NSGetEnviron();
-#endif /* LEGACY_CRT1_ENVIRON */
- environ_unlock_np();
- return ret;
-}