Libc-1082.20.4.tar.gz

[apple/libc.git] / locale / FreeBSD / wcstof.c

diff --git a/locale/FreeBSD/wcstof.c b/locale/FreeBSD/wcstof.c
index 19836cbd4c97685a3460f5f9046e046f5ddc687d..f2a6373d430c7725b7fed5736a5867c165718f14 100644 (file)
--- a/locale/FreeBSD/wcstof.c
+++ b/locale/FreeBSD/wcstof.c
@@ -25,60 +25,69 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.1 2003/03/13 06:29:53 tjr Exp $");
+__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 <stdlib.h>
 #include <wchar.h>
 #include <wctype.h>

+#include <_simple.h>

 
 /*
  * See wcstod() for comments as to the logic used.
  */
 
 /*
  * 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
 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;
 {
        static const mbstate_t initial;

-       mbstate_t state;
+       mbstate_t mbs;

        float val;
        float val;

-       char *buf, *end, *p;
-       const wchar_t *wcp;
-       size_t clen, len;
+       char *buf, *end;
+       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++;
 
                nptr++;
 

-       state = initial;
-       wcp = nptr;
-       if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (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);
                return (0.0);

-       state = initial;
-       wcsrtombs(buf, &wcp, len + 1, &state);
-
-       val = strtof(buf, &end);

 
 

-       if (endptr != NULL) {
-#if 1                                  /* Fast, assume 1:1 WC:MBS mapping. */
-               *endptr = (wchar_t *)nptr + (end - buf);
-               (void)clen;
-               (void)p;
-#else                                  /* Slow, conservative approach. */
-               state = initial;
-               *endptr = (wchar_t *)nptr;
-               p = buf;
-               while (p < end &&
-                   (clen = mbrlen(p, end - p, &state)) > 0) {
-                       p += clen;
-                       (*endptr)++;
+       first = nptr;
+       mbs = initial;
+       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);

                }
                }

-#endif
+               nptr++;

        }
 
        }
 

-       free(buf);
+       buf = _simple_string(b);
+       val = strtof_l(buf, &end, loc);
+
+       if (endptr != NULL)
+               *endptr = (end == buf) ? (wchar_t *)nptr0 : ((wchar_t *)first + __wcs_end_offset(buf, end, loc));
+
+       _simple_sfree(b);

 
        return (val);
 }
 
        return (val);
 }

+
+float
+wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
+{
+       return wcstof_l(nptr, endptr, __current_locale());
+}