81f91de9f7
When wcstof() skipped initial space and then parsing failed, it set endptr to the first non-space character. Fix it to correctly report failure by setting endptr to the beginning of the input string. The fix is from theraven@, who fixed this bug in wcstod() and wcstold() in r227753. While I'm here: Move assignments out of declarations in wcstod() and wcstold(). This is against my personal preference, but it is our agreed style(9). Set endptr correctly on malloc() failure in all three functions. Remove an incorrect comment: This is pointer arithmetic, so the code was not actually making that assumption. wcstold() advanced the wcp pointer beyond leading whitespace and then reset it back to the beginning of the string. Do not reset it. This seems to have no functional effect, since strtold_l() also skips leading whitespace. I'm making the change to keep this function consistent with wcstof() and wcstod(), and because the C11 spec prescribes the use of iswspace() to skip leading space. Reported by: libc++ unit test for std::stof(std::wstring) MFC after: 8 days Sponsored by: Dell EMC
117 lines
3.7 KiB
C
117 lines
3.7 KiB
C
/*-
|
|
* Copyright (c) 2002 Tim J. Robbins
|
|
* All rights reserved.
|
|
*
|
|
* Copyright (c) 2011 The FreeBSD Foundation
|
|
* All rights reserved.
|
|
* Portions of this software were developed by David Chisnall
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include <wctype.h>
|
|
#include "xlocale_private.h"
|
|
|
|
/*
|
|
* Convert a string to a double-precision number.
|
|
*
|
|
* This is the wide-character counterpart of strtod(). So that we do not
|
|
* have to duplicate the code of strtod() here, we convert the supplied
|
|
* wide character string to multibyte and call strtod() on the result.
|
|
* This assumes that the multibyte encoding is compatible with ASCII
|
|
* for at least the digits, radix character and letters.
|
|
*/
|
|
double
|
|
wcstod_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
|
|
locale_t locale)
|
|
{
|
|
static const mbstate_t initial;
|
|
mbstate_t mbs;
|
|
double val;
|
|
char *buf, *end;
|
|
const wchar_t *wcp;
|
|
size_t len;
|
|
size_t spaces;
|
|
FIX_LOCALE(locale);
|
|
|
|
wcp = nptr;
|
|
spaces = 0;
|
|
while (iswspace_l(*wcp, locale)) {
|
|
wcp++;
|
|
spaces++;
|
|
}
|
|
|
|
/*
|
|
* Convert the supplied numeric wide char. string to multibyte.
|
|
*
|
|
* We could attempt to find the end of the numeric portion of the
|
|
* wide char. string to avoid converting unneeded characters but
|
|
* choose not to bother; optimising the uncommon case where
|
|
* the input string contains a lot of text after the number
|
|
* duplicates a lot of strtod()'s functionality and slows down the
|
|
* most common cases.
|
|
*/
|
|
mbs = initial;
|
|
if ((len = wcsrtombs_l(NULL, &wcp, 0, &mbs, locale)) == (size_t)-1) {
|
|
if (endptr != NULL)
|
|
*endptr = (wchar_t *)nptr;
|
|
return (0.0);
|
|
}
|
|
if ((buf = malloc(len + 1)) == NULL) {
|
|
if (endptr != NULL)
|
|
*endptr = (wchar_t *)nptr;
|
|
return (0.0);
|
|
}
|
|
mbs = initial;
|
|
wcsrtombs_l(buf, &wcp, len + 1, &mbs, locale);
|
|
|
|
/* Let strtod() do most of the work for us. */
|
|
val = strtod_l(buf, &end, locale);
|
|
|
|
/*
|
|
* We only know where the number ended in the _multibyte_
|
|
* representation of the string. If the caller wants to know
|
|
* where it ended, count multibyte characters to find the
|
|
* corresponding position in the wide char string.
|
|
*/
|
|
if (endptr != NULL) {
|
|
*endptr = (wchar_t *)nptr + (end - buf);
|
|
if (buf != end)
|
|
*endptr += spaces;
|
|
}
|
|
|
|
free(buf);
|
|
|
|
return (val);
|
|
}
|
|
double
|
|
wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
|
|
{
|
|
return wcstod_l(nptr, endptr, __get_locale());
|
|
}
|