Libc-391.tar.gz

[apple/libc.git] / locale / FreeBSD / wcstold.c.patch

--- wcstold.c.orig	Thu Nov 25 11:38:20 2004
+++ wcstold.c	Fri Feb 18 14:52:24 2005
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
+#include "xlocale_private.h"
+
 #include <stdlib.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -35,7 +37,8 @@
  * See wcstod() for comments as to the logic used.
  */
 long double
-wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
+wcstold_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
+    locale_t loc)
 {
 	static const mbstate_t initial;
 	mbstate_t mbs;
@@ -44,12 +47,13 @@
 	const wchar_t *wcp;
 	size_t len;
 
-	while (iswspace(*nptr))
+	NORMALIZE_LOCALE(loc);
+	while (iswspace_l(*nptr, loc))
 		nptr++;
 
 	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;
 		return (0.0);
@@ -57,9 +61,9 @@
 	if ((buf = malloc(len + 1)) == NULL)
 		return (0.0);
 	mbs = initial;
-	wcsrtombs(buf, &wcp, len + 1, &mbs);
+	wcsrtombs_l(buf, &wcp, len + 1, &mbs, loc);
 
-	val = strtold(buf, &end);
+	val = strtold_l(buf, &end, loc);
 
 	if (endptr != NULL)
 		*endptr = (wchar_t *)nptr + (end - buf);
@@ -67,4 +71,10 @@
 	free(buf);
 
 	return (val);
+}
+
+long double
+wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
+{
+	return wcstold_l(nptr, endptr, __current_locale());
 }