From d67090c47e4902dc18afc40d044a207720d6104f Mon Sep 17 00:00:00 2001 From: guoshichao Date: Sun, 17 Sep 2023 16:12:27 +0800 Subject: [PATCH] libs/libc/wchar: add putwc implementation Signed-off-by: guoshichao --- include/wchar.h | 1 + libs/libc/stdio/CMakeLists.txt | 3 +- libs/libc/stdio/Make.defs | 2 +- libs/libc/stdio/lib_putwc.c | 85 ++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 libs/libc/stdio/lib_putwc.c diff --git a/include/wchar.h b/include/wchar.h index 68e560230c..afcf363cfc 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -159,6 +159,7 @@ size_t mbsnrtowcs(FAR wchar_t *, FAR const char **, size_t, size_t mbsrtowcs(FAR wchar_t *, FAR const char **, size_t, FAR mbstate_t *); wint_t putwc(wchar_t, FILE *); +wint_t putwc_unlocked(wchar_t, FAR FILE *); wint_t putwchar(wchar_t); int swprintf(FAR wchar_t *, size_t, FAR const wchar_t *, ...); int swscanf(FAR const wchar_t *, FAR const wchar_t *, ...); diff --git a/libs/libc/stdio/CMakeLists.txt b/libs/libc/stdio/CMakeLists.txt index b89cc148da..0cd8188e5a 100644 --- a/libs/libc/stdio/CMakeLists.txt +++ b/libs/libc/stdio/CMakeLists.txt @@ -102,7 +102,8 @@ if(CONFIG_FILE_STREAM) lib_libstream.c lib_libfilelock.c lib_libgetstreams.c - lib_fputwc.c) + lib_fputwc.c + lib_putwc.c) endif() target_sources(c PRIVATE ${SRCS}) diff --git a/libs/libc/stdio/Make.defs b/libs/libc/stdio/Make.defs index c40252eefe..bc45285b7b 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 +CSRCS += lib_libgetstreams.c lib_setbuffer.c lib_fputwc.c lib_putwc.c endif # Add the stdio directory to the build diff --git a/libs/libc/stdio/lib_putwc.c b/libs/libc/stdio/lib_putwc.c new file mode 100644 index 0000000000..f7ad8c1002 --- /dev/null +++ b/libs/libc/stdio/lib_putwc.c @@ -0,0 +1,85 @@ +/**************************************************************************** + * libs/libc/stdio/lib_putwc.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 + +#ifdef CONFIG_FILE_STREAM + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: putwc_unlocked + * + * Description: + * Write wide character to stream without lock the stream + * + * Input Parameters: + * c - the wide character to write + * 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 + * + ****************************************************************************/ + +wint_t putwc_unlocked(wchar_t c, FAR FILE *f) +{ + return fputwc_unlocked(c, f); +} + +/**************************************************************************** + * Name: putwc + * + * Description: + * Write wide character to stream + * + * Input Parameters: + * c - the wide character to write + * 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 + * + ****************************************************************************/ + +wint_t putwc(wchar_t c, FAR FILE *f) +{ + flockfile(f); + c = putwc_unlocked(c, f); + funlockfile(f); + return c; +} + +#endif /* CONFIG_FILE_STREAM */