e635b30956
* mingwex/gdtoa: New directory.
* mingwex/gdtoa/(arithchk.c, dmisc.c, dtoa.c, g__fmt.c, g_dfmt.c,
g_ffmt.c, g_xfmt.c, gd_arith.h, gd_qnan.h, gdtoa.c, gdtoa.h,
gdtoaimp.h, gethex.c, gmisc.c, hd_init.c, hexnan.c, misc.c, qnan.c,
README, smisc.c, strtodg.c, strtodnrp.c, strtof.c, strtopx.c, sum.c,
ulp.c): New files.
* mingwex/(strtof.c, strtold.c, ldtoa.c): Remove files.
* mingwex/math/(cephes-emath.c, cephes-emath.h): Remove files.
* mingwex/mb_wc_common.h (get_cp_from_locale); Rename to get_codepage().
* mingwex/(btowc.c, wctob.c, mbrtowc.c, wcrtomb.c): Adjust call to get_codepage().
* mingwex/wcstold.c: Avoid using strtold internals.
* mingwex/wcstof.c: Rewrite.
* mingwex/Makefile.in (GDTOA_DISTFILES): Add to distribution.
(GDTOA_OBJS): Add to library.
(DISTFILES): Remove strtof.c strtold.c ldtoa.c cephes-emath.c cephes-emath.h.
(STDLIB_OBJS): Remove.
(STDLIB_STUB_OBJS): Remove strtof.o wcstof,o.
(Q8_OBJS): Add wcstof.o wcstold.o.
* include/stdlib.h (strtof): Remove inline definition.
(wcstof): Likewise.
* include/wchar.h (wcstof): Remove inline definition.
65 lines
1.7 KiB
C
65 lines
1.7 KiB
C
/* Wide char wrapper for strtof
|
|
* Revision history:
|
|
* 25 Aug 2006 Initial version.
|
|
*
|
|
* Contributor: Danny Smith <dannysmith@users.sourceforege.net>
|
|
*/
|
|
|
|
/* This routine has been placed in the public domain.*/
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include <locale.h>
|
|
#include <wchar.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <mbstring.h>
|
|
|
|
#include "mb_wc_common.h"
|
|
|
|
float wcstof (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse)
|
|
{
|
|
char * cs;
|
|
char * cse;
|
|
unsigned int i;
|
|
float ret;
|
|
const unsigned int cp = get_codepage ();
|
|
|
|
/* Allocate enough room for (possibly) mb chars */
|
|
cs = (char *) malloc ((wcslen(wcs)+1) * MB_CUR_MAX);
|
|
|
|
if (cp == 0) /* C locale */
|
|
{
|
|
for (i = 0; (wcs[i] != 0) && wcs[i] <= 255; i++)
|
|
cs[i] = (char) wcs[i];
|
|
cs[i] = '\0';
|
|
}
|
|
else
|
|
{
|
|
int nbytes = -1;
|
|
int mb_len = 0;
|
|
/* loop through till we hit null or invalid character */
|
|
for (i = 0; (wcs[i] != 0) && (nbytes != 0); i++)
|
|
{
|
|
nbytes = WideCharToMultiByte(cp, WC_COMPOSITECHECK | WC_SEPCHARS,
|
|
wcs + i, 1, cs + mb_len, MB_CUR_MAX,
|
|
NULL, NULL);
|
|
mb_len += nbytes;
|
|
}
|
|
cs[mb_len] = '\0';
|
|
}
|
|
|
|
ret = strtof (cs, &cse);
|
|
|
|
if (wcse)
|
|
{
|
|
/* Make sure temp mbstring cs has 0 at cse. */
|
|
*cse = '\0';
|
|
i = _mbslen ((unsigned char*) cs); /* Number of chars, not bytes */
|
|
*wcse = (wchar_t *) wcs + i;
|
|
}
|
|
free (cs);
|
|
|
|
return ret;
|
|
}
|