--- wcstof.c.orig 2009-11-09 15:05:25.000000000 -0800
+++ wcstof.c 2009-11-09 15:05:26.000000000 -0800
@@ -27,44 +27,67 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
+#include "xlocale_private.h"
+
#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
+#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);
+
float
-wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
+wcstof_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
+ locale_t loc)
{
static const mbstate_t initial;
mbstate_t mbs;
float 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);
+ ctype = __numeric_ctype(loc);
+
+ while (iswspace_l(*nptr, ctype))
nptr++;
- wcp = nptr;
- mbs = initial;
- if ((len = wcsrtombs(NULL, &wcp, 0, &mbs)) == (size_t)-1) {
- if (endptr != NULL)
- *endptr = (wchar_t *)nptr;
- return (0.0);
- }
- if ((buf = malloc(len + 1)) == NULL)
+ if ((b = _simple_salloc()) == NULL)
return (0.0);
+
+ first = nptr;
mbs = initial;
- wcsrtombs(buf, &wcp, len + 1, &mbs);
+ 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 = strtof(buf, &end);
+ buf = _simple_string(b);
+ val = strtof_l(buf, &end, loc);
if (endptr != NULL)
- *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);
}
+
+float
+wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
+{
+ return wcstof_l(nptr, endptr, __current_locale());
+}