Added snprintf

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@325 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 104 insertions, 4 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index dc978d3c3..b4c345e50 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -204,3 +204,5 @@
 	* Imported uIP into the tree (see
 	   http://www.sics.se/~adam/uip/index.php/Main_Page)
 	* Adding socket(), bind(), connect()
+	* Added snprintf()
+
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 308e51e7d..ef9aa49f7 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -638,6 +638,7 @@ Other memory:
 	* Imported uIP into the tree (see
 	   http://www.sics.se/~adam/uip/index.php/Main_Page)
 	* Adding socket(), bind(), connect()
+	* Added snprintf()
 </pre></ul>
 
 <table width ="100%">
diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h
index ed6596286..bf9161b81 100644
--- a/nuttx/include/stdio.h
+++ b/nuttx/include/stdio.h
@@ -122,7 +122,9 @@ EXTERN char  *gets(char *s);
 EXTERN int    printf(const char *format, ...);
 EXTERN int    puts(const char *s);
 EXTERN int    rename(const char *oldpath, const char *newpath);
-EXTERN int    sprintf(char *dest, const char *format, ...);
+EXTERN int    sprintf(char *buf, const char *format, ...);
+EXTERN int    snprintf(char *buf, size_t size, const char *format, ...);
+
 EXTERN int    ungetc(int c, FILE *stream);
 EXTERN int    vprintf(const char *s, va_list ap);
 EXTERN int    vfprintf(FILE *stream, const char *s, va_list ap);
diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index 13621ed4d..8f595fdd6 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -52,9 +52,9 @@ STRING_SRCS	= lib_memset.c lib_memcpy.c lib_memcmp.c lib_memmove.c lib_strcpy.c
 
 CTYPE_SRCS	= 
 
-STDIO_SRCS	= lib_printf.c lib_rawprintf.c lib_lowprintf.c lib_sprintf.c lib_libsprintf.c \
-		  lib_vsprintf.c lib_libvsprintf.c lib_memstream.c lib_lowstream.c lib_nullstream.c \
-		  lib_sscanf.c
+STDIO_SRCS	= lib_printf.c lib_rawprintf.c lib_lowprintf.c lib_sprintf.c lib_snprintf.c \
+		  lib_libsprintf.c lib_vsprintf.c lib_libvsprintf.c lib_memstream.c lib_lowstream.c \
+		  lib_nullstream.c lib_sscanf.c
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 STDIO_SRCS	+= lib_rawstream.c
diff --git a/nuttx/lib/lib_snprintf.c b/nuttx/lib/lib_snprintf.c
new file mode 100644
index 000000000..4f018ff51
--- /dev/null
+++ b/nuttx/lib/lib_snprintf.c
@@ -0,0 +1,95 @@
+/************************************************************
+ * lib_snprintf.c
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 Gregory Nutt 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 <stdio.h>
+#include "lib_internal.h"
+
+/************************************************************
+ * Definitions
+ ************************************************************/
+
+/************************************************************
+ * Private Type Declarations
+ ************************************************************/
+
+/************************************************************
+ * Private Function Prototypes
+ ************************************************************/
+
+/************************************************************
+ * Global Constant Data
+ ************************************************************/
+
+/************************************************************
+ * Global Variables
+ ************************************************************/
+
+/************************************************************
+ * Private Constant Data
+ ************************************************************/
+
+/************************************************************
+ * Private Variables
+ ************************************************************/
+
+/************************************************************
+ * Global Functions
+ ************************************************************/
+
+/************************************************************
+ * sprintf
+ ************************************************************/
+
+int snprintf(char *buf, size_t size, const char *format, ...)
+{
+  struct lib_memstream_s memstream;
+  va_list ap;
+  int     n;
+
+  /* Initialize a memory stream to write to the buffer */
+
+  lib_memstream(&memstream, buf, size);
+
+  /* Then let lib_vsprintf do the real work */
+
+  va_start(ap, format);
+  n = lib_vsprintf(&memstream.public, format, ap);
+  va_end(ap);
+  return n;
+}