--- Libc/Libc-1725.40.4/string/FreeBSD/strerror.c
+++ Libc/Libc-825.26/string/FreeBSD/strerror.c
@@ -41,7 +41,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #define	UPREFIX		"Unknown error"
 
@@ -53,6 +52,7 @@
  */
 #define	EBUFSIZE	(20 + 2 + sizeof(UPREFIX))
 
+#ifndef BUILDING_VARIANT
 /*
  * Doing this by hand instead of linking with stdio(3) avoids bloat for
  * statically linked binaries.
@@ -115,27 +115,20 @@
 
 	return (retval);
 }
-
-static char *__strerror_ebuf = NULL;
+#else /* BUILDING_VARIANT */
+__private_extern__ void __errstr(int, char *, size_t);
+#endif /* !BUILDING_VARIANT */
 
 char *
 strerror(int num)
 {
-#if !defined(NLS)
-	if (num >= 0 && num < sys_nerr) {
-		return (char*)sys_errlist[num];
-	}
+	static char ebuf[NL_TEXTMAX];
+
+#if !__DARWIN_UNIX03
+	if (strerror_r(num, ebuf, sizeof(ebuf)) != 0)
+	errno = EINVAL;
+#else
+	(void)strerror_r(num, ebuf, sizeof(ebuf));
 #endif
-
-	if (__strerror_ebuf == NULL) {
-		__strerror_ebuf = calloc(1, NL_TEXTMAX);
-		if (__strerror_ebuf == NULL) {
-			return NULL;
-		}
-	}
-
-	if (strerror_r(num, __strerror_ebuf, NL_TEXTMAX) != 0) {
-		errno = EINVAL;
-	}
-	return __strerror_ebuf;
+	return (ebuf);
 }