From 8bc080b7c6fbf52503696d02c6bdf9941a6da13f Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Wed, 8 Mar 2017 13:00:37 -0600 Subject: [PATCH] Add swprintf function --- libc/libc.csv | 1 + libc/wchar/Make.defs | 2 +- libc/wchar/lib_swprintf.c | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 libc/wchar/lib_swprintf.c diff --git a/libc/libc.csv b/libc/libc.csv index 5282519c8a..cbc0976ea1 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -176,6 +176,7 @@ "strtoull","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","unsigned long long","FAR const char *","FAR char **","int" "strxfrm","string.h","defined(CONFIG_LIBC_LOCALE)","size_t","FAR char *","FAR const char *","size_t" "swab","unistd.h","","void","int","FAR const void *","FAR void *","ssize_t" +"swprintf","wchar.h","defined(CONFIG_LIBC_WCHAR)","int","FAR wchar_t *","size_t","FAR const wchar_t *","..." "syslog","syslog.h","","int","int","FAR const char *","..." "tcflush","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int" "tcgetattr","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","FAR struct termios *" diff --git a/libc/wchar/Make.defs b/libc/wchar/Make.defs index c45807574a..91403cc8a2 100644 --- a/libc/wchar/Make.defs +++ b/libc/wchar/Make.defs @@ -42,7 +42,7 @@ 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 lib_wcstof.c -CSRCS += lib_wcstod.c +CSRCS += lib_wcstod.c lib_swprintf.c # Add the wchar directory to the build diff --git a/libc/wchar/lib_swprintf.c b/libc/wchar/lib_swprintf.c new file mode 100644 index 0000000000..f108f31fac --- /dev/null +++ b/libc/wchar/lib_swprintf.c @@ -0,0 +1,77 @@ +/**************************************************************************** + * libc/wchar/lib_swprintf.c + * + * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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 +#include +#include +#include "libc.h" + +#include + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * swprintf + ****************************************************************************/ + +int swprintf(FAR wchar_t *buf, size_t maxlen, FAR const wchar_t *fmt, ...) +{ + struct lib_memoutstream_s memoutstream; + va_list ap; + int n; + + /* Initialize a memory stream to write to the buffer */ + + lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, + (FAR char *) buf, LIB_BUFLEN_UNKNOWN); + + /* Then let lib_vsprintf do the real work */ + + va_start(ap, fmt); + n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, + (FAR const char *)fmt, ap); + va_end(ap); + + return n; +}