X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf.c;h=53cb92058a60614cb4b29c9fc6ba25e799e29257;hb=4bf15025c3fe95a226686b793e39a44f5f08d7da;hp=7a8e62af3c37bdf21e309de3d3ce261d9df0d664;hpb=37d3acaa622b7f695ce57578e56311d031a22d22;p=bertos.git

diff --git a/mware/sprintf.c b/mware/sprintf.c
index 7a8e62af..53cb9205 100755
--- a/mware/sprintf.c
+++ b/mware/sprintf.c
@@ -1,41 +1,55 @@
-/*!
+/**
  * \file
  * <!--
- * Copyright (C) 2002,2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2002, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
- * \version $Id$
+ * \brief sprintf() implementation based on _formatted_write()
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
- *
- * \brief Simple sprintf() implementation based on _formatted_write()
  */
 
-/*
- * $Log$
- * Revision 1.1  2004/05/23 15:43:16  bernie
- * Import mware modules.
- *
- * Revision 1.4  2004/04/03 20:42:27  aleph
- * Remove duplicated defines
- *
- * Revision 1.3  2004/03/24 15:48:53  bernie
- * Remove Copyright messages from Doxygen output
- *
- * Revision 1.2  2004/03/19 16:51:30  bernie
- * Add PROGMEM kludge.
- *
- * Revision 1.1  2004/02/23 09:45:09  aleph
- * Add missing library functions.
- *
- * Revision 1.1  2003/11/13 16:56:37  aleph
- * Add first implementation of dsp firmware
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.11  2006/07/19 12:56:28  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.10  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.9  2005/02/18 12:48:01  bernie
+ *#* Fix bug with NULL buffers (caught with unit test).
+ *#*
+ *#* Revision 1.8  2005/02/18 12:34:29  bernie
+ *#* Include <mware/pgm.h> explicitly for non-Harvard archs.
+ *#*
+ *#* Revision 1.7  2004/12/31 17:47:45  bernie
+ *#* Rename UNUSED() to UNUSED_ARG().
+ *#*
+ *#* Revision 1.6  2004/11/16 21:15:19  bernie
+ *#* Fix off-by-one bug in [v]snprintf().
+ *#*
+ *#* Revision 1.5  2004/10/03 18:54:36  bernie
+ *#* sprintf(): Fix a serious bug; snprintf(): New function.
+ *#*
+ *#* Revision 1.4  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.3  2004/06/27 15:20:26  aleph
+ *#* Change UNUSED() macro to accept two arguments: type and name;
+ *#* Add macro GNUC_PREREQ to detect GCC version during build;
+ *#* Some spacing cleanups and typo fix
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*/
+
+#include <mware/formatwr.h>
+#include <mware/pgm.h>
+#include <cfg/compiler.h>
 
-#include "compiler.h"
-#include "formatwr.h"
 #include <stdio.h>
 
 
@@ -50,26 +64,31 @@ static void __str_put_char(char c, void *ptr)
 	(*((char **)ptr))++;
 }
 
-static void __null_put_char(UNUSED(char c), UNUSED(void *ptr))
+static void __null_put_char(UNUSED_ARG(char, c), UNUSED_ARG(void *, ptr))
 {
 	/* nop */
 }
 
 
-int PGM_FUNC(vsprintf)(char * str, const char * PGM_ATTR fmt, va_list ap)
+int PGM_FUNC(vsprintf)(char *str, const char * PGM_ATTR fmt, va_list ap)
 {
 	int result;
 
-	result = PGM_FUNC(_formatted_write)(
-			fmt, (str ? __str_put_char : __null_put_char), &str, ap);
+	if (str)
+	{
+		result = PGM_FUNC(_formatted_write)(fmt, __str_put_char, &str, ap);
+
+		/* Terminate string */
+		*str = '\0';
+	}
+	else
+		result = PGM_FUNC(_formatted_write)(fmt, __null_put_char, 0, ap);
 
-	/* terminate string */
-	*str = '\0';
 
 	return result;
 }
 
-/* FIXME: sprintf_P is incorrectly declared in <stdio.h> */
+
 int PGM_FUNC(sprintf)(char *str, const char * fmt, ...)
 {
 	int result;
@@ -79,8 +98,67 @@ int PGM_FUNC(sprintf)(char *str, const char * fmt, ...)
 	result = PGM_FUNC(vsprintf)(str, fmt, ap);
 	va_end(ap);
 
-	/* terminate string */
-	*str = '\0';
+	return result;
+}
+
+/**
+ * State information for __sn_put_char()
+ */
+struct __sn_state
+{
+	char *str;
+	size_t len;
+};
+
+/**
+ * formatted_write() callback used [v]snprintf().
+ */
+static void __sn_put_char(char c, void *ptr)
+{
+	struct __sn_state *state = (struct __sn_state *)ptr;
+
+	if (state->len)
+	{
+		--state->len;
+		*state->str++ = c;
+	}
+}
+
+
+int PGM_FUNC(vsnprintf)(char *str, size_t size, const char * PGM_ATTR fmt, va_list ap)
+{
+	int result = 0;
+
+	/* Make room for traling '\0'. */
+	if (size--)
+	{
+		if (str)
+		{
+			struct __sn_state state;
+			state.str = str;
+			state.len = size;
+
+			result = PGM_FUNC(_formatted_write)(fmt, __sn_put_char, &state, ap);
+
+			/* Terminate string. */
+			*state.str = '\0';
+		}
+		else
+			result = PGM_FUNC(_formatted_write)(fmt, __null_put_char, 0, ap);
+	}
+
+	return result;
+}
+
+
+int PGM_FUNC(snprintf)(char *str, size_t size, const char * fmt, ...)
+{
+	int result;
+	va_list ap;
+
+	va_start(ap, fmt);
+	result = PGM_FUNC(vsnprintf)(str, size, fmt, ap);
+	va_end(ap);
 
 	return result;
 }