--- Libc/Libc-391/locale/FreeBSD/wcstold.c.patch
+++ Libc/Libc-583/locale/FreeBSD/wcstold.c.patch
@@ -1,6 +1,6 @@
---- wcstold.c.orig	Thu Nov 25 11:38:20 2004
-+++ wcstold.c	Fri Feb 18 14:52:24 2005
-@@ -27,6 +27,8 @@
+--- wcstold.c.orig	2008-10-09 11:50:53.000000000 -0700
++++ wcstold.c	2008-10-29 00:51:34.000000000 -0700
+@@ -27,44 +27,67 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
  
@@ -9,9 +9,14 @@
  #include <stdlib.h>
  #include <wchar.h>
  #include <wctype.h>
-@@ -35,7 +37,8 @@
++#include <_simple.h>
+ 
+ /*
   * See wcstod() for comments as to the logic used.
   */
++
++extern size_t __wcs_end_offset(const char * __restrict buf, const char * __restrict end, locale_t loc);
++
  long double
 -wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
 +wcstold_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
@@ -19,42 +24,62 @@
  {
  	static const mbstate_t initial;
  	mbstate_t mbs;
-@@ -44,12 +47,13 @@
- 	const wchar_t *wcp;
+ 	long double val;
+ 	char *buf, *end;
+-	const wchar_t *wcp;
  	size_t len;
++	locale_t ctype;
++	_SIMPLE_STRING b;
++	char mb[MB_CUR_MAX + 1];
++	const wchar_t *nptr0 = nptr;
++	const wchar_t *first;
  
 -	while (iswspace(*nptr))
 +	NORMALIZE_LOCALE(loc);
-+	while (iswspace_l(*nptr, loc))
++	ctype = __numeric_ctype(loc);
++
++	while (iswspace_l(*nptr, ctype))
  		nptr++;
  
- 	wcp = nptr;
- 	mbs = initial;
+-	wcp = nptr;
+-	mbs = initial;
 -	if ((len = wcsrtombs(NULL, &wcp, 0, &mbs)) == (size_t)-1) {
-+	if ((len = wcsrtombs_l(NULL, &wcp, 0, &mbs, loc)) == (size_t)-1) {
- 		if (endptr != NULL)
- 			*endptr = (wchar_t *)nptr;
+-		if (endptr != NULL)
+-			*endptr = (wchar_t *)nptr;
+-		return (0.0);
+-	}
+-	if ((buf = malloc(len + 1)) == NULL)
++	if ((b = _simple_salloc()) == NULL)
  		return (0.0);
-@@ -57,9 +61,9 @@
- 	if ((buf = malloc(len + 1)) == NULL)
- 		return (0.0);
++
++	first = nptr;
  	mbs = initial;
 -	wcsrtombs(buf, &wcp, len + 1, &mbs);
-+	wcsrtombs_l(buf, &wcp, len + 1, &mbs, loc);
++	while (*nptr && (len = wcrtomb_l(mb, *nptr, &mbs, ctype)) != (size_t)-1) {
++		mb[len] = 0;
++		if (_simple_sappend(b, mb) < 0) { /* no memory */
++			_simple_sfree(b);
++			return (0.0);
++		}
++		nptr++;
++	}
  
 -	val = strtold(buf, &end);
++	buf = _simple_string(b);
 +	val = strtold_l(buf, &end, loc);
  
  	if (endptr != NULL)
- 		*endptr = (wchar_t *)nptr + (end - buf);
-@@ -67,4 +71,10 @@
- 	free(buf);
+-		*endptr = (wchar_t *)nptr + (end - buf);
++		*endptr = (end == buf) ? (wchar_t *)nptr0 : ((wchar_t *)first + __wcs_end_offset(buf, end, loc));
+ 
+-	free(buf);
++	_simple_sfree(b);
  
  	return (val);
-+}
+ }
 +
 +long double
 +wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
 +{
 +	return wcstold_l(nptr, endptr, __current_locale());
- }
++}