X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf.c;h=0b05ce7ba6e3bc2db9a049dcdaf56011d9574ab1;hb=99fafc49f3b2d50abb2d7b8b4cbbd3be8e107bef;hp=def6d20f035a207968700ce39653f8786f98ed78;hpb=a5175fd44dd7528960b1216182afb4fe96c4664e;p=bertos.git

diff --git a/mware/sprintf.c b/mware/sprintf.c
old mode 100755
new mode 100644
index def6d20f..0b05ce7b
--- a/mware/sprintf.c
+++ b/mware/sprintf.c
@@ -1,49 +1,45 @@
-/*!
+/**
  * \file
  * <!--
- * Copyright (C) 2002,2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
- * -->
- *
- * \version $Id$
+ * This file is part of BeRTOS.
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * \brief Simple sprintf() implementation based on _formatted_write()
- */
-
-/*
- * $Log$
- * 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
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Revision 1.1  2004/05/23 15:43:16  bernie
- * Import mware modules.
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
  *
- * Revision 1.4  2004/04/03 20:42:27  aleph
- * Remove duplicated defines
+ * Copyright 2002, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  *
- * 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
+ * \brief sprintf() implementation based on _formatted_write()
  *
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#include "compiler.h"
-#include "formatwr.h"
+#include <mware/formatwr.h>
+#include <mware/pgm.h>
+#include <cfg/compiler.h>
+
 #include <stdio.h>
 
 
@@ -58,26 +54,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;
@@ -87,8 +88,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;
 }