diff --git a/include/wchar.h b/include/wchar.h index afcf363cfc7..d37fb235543 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -147,6 +147,7 @@ FAR wchar_t *fgetws(wchar_t *, int, FILE *); wint_t fputwc(wchar_t, FILE *); wint_t fputwc_unlocked(wchar_t, FAR FILE *); int fputws(FAR const wchar_t *, FILE *); +int fputws_unlocked(FAR const wchar_t *, FAR FILE *); int fwide(FILE *, int); wint_t getwc(FILE *); wint_t getwchar(void); diff --git a/libs/libc/stdio/CMakeLists.txt b/libs/libc/stdio/CMakeLists.txt index 0cd8188e5a8..b1f0cb926e3 100644 --- a/libs/libc/stdio/CMakeLists.txt +++ b/libs/libc/stdio/CMakeLists.txt @@ -103,7 +103,8 @@ if(CONFIG_FILE_STREAM) lib_libfilelock.c lib_libgetstreams.c lib_fputwc.c - lib_putwc.c) + lib_putwc.c + lib_fputws.c) endif() target_sources(c PRIVATE ${SRCS}) diff --git a/libs/libc/stdio/Make.defs b/libs/libc/stdio/Make.defs index bc45285b7b7..d438ceaf6e1 100644 --- a/libs/libc/stdio/Make.defs +++ b/libs/libc/stdio/Make.defs @@ -47,7 +47,7 @@ CSRCS += lib_fputs.c lib_ungetc.c lib_fprintf.c lib_vfprintf.c CSRCS += lib_feof.c lib_ferror.c lib_rewind.c lib_clearerr.c CSRCS += lib_scanf.c lib_vscanf.c lib_fscanf.c lib_vfscanf.c lib_tmpfile.c CSRCS += lib_setbuf.c lib_setvbuf.c lib_libstream.c lib_libfilelock.c -CSRCS += lib_libgetstreams.c lib_setbuffer.c lib_fputwc.c lib_putwc.c +CSRCS += lib_libgetstreams.c lib_setbuffer.c lib_fputwc.c lib_putwc.c lib_fputws.c endif # Add the stdio directory to the build diff --git a/libs/libc/stdio/lib_fputws.c b/libs/libc/stdio/lib_fputws.c new file mode 100644 index 00000000000..71d4f3f6de7 --- /dev/null +++ b/libs/libc/stdio/lib_fputws.c @@ -0,0 +1,101 @@ +/**************************************************************************** + * libs/libc/stdio/lib_fputws.c + * + * Copyright © 2005-2014 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +#include "libc.h" + +#ifdef CONFIG_FILE_STREAM + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: fputws_unlocked + * + * Description: + * Write wide string to stream without lock the stream + * + * Input Parameters: + * ws - the wide string to write to the stream + * f - the FILE object that identifies an output stream + * + * Returned Value: + * Return the wide character that written in to the stream on success, + * return WEOF on fail write to the stream + * + ****************************************************************************/ + +int fputws_unlocked(FAR const wchar_t *ws, FAR FILE *f) +{ + char buf[BUFSIZ]; + size_t l = 0; + + while (ws && + (l = wcsrtombs(buf, &ws, sizeof(buf), NULL)) + 1 > 1) + { + if (lib_fwrite_unlocked(buf, l, f) < l) + { + funlockfile(f); + return -1; + } + } + + return l; +} + +/**************************************************************************** + * Name: fputws + * + * Description: + * Write wide string to stream + * + * Input Parameters: + * ws - the wide string to write to the stream + * f - the FILE object that identifies an output stream + * + * Returned Value: + * Return the wide character that written in to the stream on success, + * return WEOF on fail write to the stream + * + ****************************************************************************/ + +int fputws(FAR const wchar_t *ws, FAR FILE *f) +{ + int l; + flockfile(f); + l = fputws_unlocked(ws, f); + funlockfile(f); + return l; +} + +#endif /* CONFIG_FILE_STREAM */