diff --git a/include/cxx/cwchar b/include/cxx/cwchar index 813f4cde9c..284a351a98 100755 --- a/include/cxx/cwchar +++ b/include/cxx/cwchar @@ -111,6 +111,7 @@ namespace std using ::wcsspn; using ::wcsstr; using ::wcstod; + using ::wcstof; using ::wcstok; using ::wcstol; using ::wcstoll; diff --git a/include/wchar.h b/include/wchar.h index 5f31fe2ba6..0644cb9f40 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -215,6 +215,7 @@ size_t wcsrtombs(FAR char *, FAR const wchar_t **, size_t, size_t wcsspn(FAR const wchar_t *, FAR const wchar_t *); FAR wchar_t *wcsstr(FAR const wchar_t *, FAR const wchar_t *); double wcstod(FAR const wchar_t *, FAR wchar_t **); +float wcstof(FAR const wchar_t *, FAR wchar_t **); FAR wchar_t *wcstok(FAR wchar_t *, FAR const wchar_t *, FAR wchar_t **); long int wcstol(FAR const wchar_t *, FAR wchar_t **, int); long double wcstold(FAR const wchar_t *, FAR wchar_t **); diff --git a/libc/libc.csv b/libc/libc.csv index 8538421b88..9e3c76b28f 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -202,6 +202,7 @@ "wcsftime","wchar.h","defined(CONFIG_LIBC_WCHAR)","size_t","FAR wchar_t *","size_t","FAR const wchar_t *","FAR const struct tm *" "wcslcpy","wchar.h","defined(CONFIG_LIBC_WCHAR)","size_t","FAR const wchar_t *","FAR const wchar_t *","size_t" "wcslen","wchar.h","defined(CONFIG_LIBC_WCHAR)","size_t","FAR const wchar_t *" +"wcstof","wchar.h","defined(CONFIG_LIBC_WCHAR)","float","FAR const wchar_t *","FAR wchar_t **" "wcstol","wchar.h","defined(CONFIG_LIBC_WCHAR)","long int","FAR const wchar_t *","FAR wchar_t **","int" "wcstold","wchar.h","defined(CONFIG_LIBC_WCHAR)","long double","FAR const wchar_t *","FAR wchar_t **" "wcstoll","wchar.h","defined(CONFIG_LIBC_WCHAR)","long long int","FAR const wchar_t *","FAR wchar_t **","int" diff --git a/libc/wchar/Make.defs b/libc/wchar/Make.defs index 5fb39dc3c6..680ab5504c 100644 --- a/libc/wchar/Make.defs +++ b/libc/wchar/Make.defs @@ -41,7 +41,7 @@ CSRCS += lib_wcscmp.c lib_wcslen.c lib_wmemchr.c lib_wmemcmp.c CSRCS += lib_wmemcpy.c lib_wmemmove.c lib_wmemset.c lib_btowc.c CSRCS += lib_mbrtowc.c lib_wctob.c lib_wcslcpy.c lib_wcsxfrm.c CSRCS += lib_wcrtomb.c lib_wcsftime.c lib_wcscoll.c lib_wcstol.c -CSRCS += lib_wcstoll.c lib_wcstoul.c lib_wcstold.c +CSRCS += lib_wcstoll.c lib_wcstoul.c lib_wcstold.c lib_wcstof.c # Add the wchar directory to the build diff --git a/libc/wchar/lib_wcstof.c b/libc/wchar/lib_wcstof.c new file mode 100644 index 0000000000..c380f21a8a --- /dev/null +++ b/libc/wchar/lib_wcstof.c @@ -0,0 +1,60 @@ +/**************************************************************************** + * libc/wchar/lib_wcstof.c + * + * Copyright (c)1999 Citrus Project, + * All rights reserved. + * + * 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#ifdef CONFIG_LIBC_WCHAR + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: wcslen + * + * Description: + * The wcstof() function is the wide-character equivalent of the strtof() + * function. It converts a wchar string to long long value. + * + ****************************************************************************/ + +float wcstof(FAR const wchar_t *nptr, FAR wchar_t **endptr) +{ + return strtof((FAR const char *)nptr, (FAR char **)endptr); +} + +#endif /* CONFIG_LIBC_WCHAR */