--- Libc/Libc-1353.100.2/stdlib/FreeBSD/getenv.c
+++ Libc/Libc-825.26/stdlib/FreeBSD/getenv.c
@@ -33,18 +33,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.8 2007/05/01 16:02:41 ache Exp $");
 
-#include <os/lock_private.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <crt_externs.h>
 
-__private_extern__ char *__findenv_locked(const char *, int *, char **);
-__private_extern__ void __environ_lock(void);
-__private_extern__ void __environ_unlock(void);
+__private_extern__ char *__findenv(const char *, int *, char **);
 
 /*
- * __findenv_locked --
+ * __findenv --
  *	Returns pointer to value associated with name, if any, else NULL.
  *	Sets offset to be the offset of the name/value combination in the
  *	environmental array, for use by setenv(3) and unsetenv(3).
@@ -53,7 +50,7 @@
  *	This routine *should* be a static; don't use it.
  */
 __private_extern__ char *
-__findenv_locked(name, offset, environ)
+__findenv(name, offset, environ)
 	const char *name;
 	int *offset;
 	char **environ;
@@ -79,24 +76,6 @@
 	return (NULL);
 }
 
-static os_unfair_lock __environ_lock_obj = OS_UNFAIR_LOCK_INIT;
-__private_extern__ void
-__environ_lock(void)
-{
-	os_unfair_lock_lock_with_options(
-			&__environ_lock_obj, OS_UNFAIR_LOCK_DATA_SYNCHRONIZATION);
-}
-__private_extern__ void
-__environ_unlock(void)
-{
-	os_unfair_lock_unlock(&__environ_lock_obj);
-}
-__private_extern__ void
-__environ_lock_fork_child(void)
-{
-	__environ_lock_obj = OS_UNFAIR_LOCK_INIT;
-}
-
 /*
  * _getenvp -- SPI using an arbitrary pointer to string array (the array must
  * have been created with malloc) and an env state, created by _allocenvstate().
@@ -105,12 +84,9 @@
 char *
 _getenvp(const char *name, char ***envp, void *state __unused)
 {
-	// envp is passed as an argument, so the lock is not protecting everything
 	int offset;
-	__environ_lock();
-	char *result = (__findenv_locked(name, &offset, *envp));
-	__environ_unlock();
-	return result;
+
+	return (__findenv(name, &offset, *envp));
 }
 
 /*
@@ -122,8 +98,6 @@
 	const char *name;
 {
 	int offset;
-	__environ_lock();
-	char *result = __findenv_locked(name, &offset, *_NSGetEnviron());
-	__environ_unlock();
-	return result;
+
+	return (__findenv(name, &offset, *_NSGetEnviron()));
 }