X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf.c;h=b756fb1dec503112d7a0c0ae664470c70db197dd;hb=f76621bb61f5830efac4a110760ae357d0ffab0f;hp=84c5f0c6ba3dd2c989e66640a291658b3ad2df44;hpb=96f8c49fdf97d48ddbacb1d8d94fd5a735051e2d;p=bertos.git

diff --git a/mware/sprintf.c b/mware/sprintf.c
index 84c5f0c6..b756fb1d 100755
--- a/mware/sprintf.c
+++ b/mware/sprintf.c
@@ -1,8 +1,8 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 2002,2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * Copyright 2002, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief sprintf() implementation based on _formatted_write()
@@ -13,6 +13,12 @@
 
 /*#*
  *#* $Log$
+ *#* 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().
  *#*
@@ -34,8 +40,10 @@
  *#* Add dual-license information.
  *#*/
 
+#include <mware/formatwr.h>
+#include <mware/pgm.h>
 #include "compiler.h"
-#include "formatwr.h"
+
 #include <stdio.h>
 
 
@@ -56,15 +64,20 @@ static void __null_put_char(UNUSED_ARG(char, c), UNUSED_ARG(void *, ptr))
 }
 
 
-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;
 }
@@ -113,15 +126,19 @@ int PGM_FUNC(vsnprintf)(char *str, size_t size, const char * PGM_ATTR fmt, va_li
 	/* Make room for traling '\0'. */
 	if (size--)
 	{
-		struct __sn_state state;
-		state.str = str;
-		state.len = size;
-
-		result = PGM_FUNC(_formatted_write)(
-			fmt, (str ? __sn_put_char : __null_put_char), &state, ap);
-
-		/* Terminate string. */
-		*state.str = '\0';
+		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;