X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf.c;h=6ce8e0da5031c69e610d7b0b21aaf27ab6d80949;hb=972073a11abb5cf0b382b1a74298185ee4a9466a;hp=2950727f14ff0e414dd5e1be23105dd6fef64155;hpb=a1d43c00e1504fd5e7e89d84516c0a8c86883ce9;p=bertos.git

diff --git a/mware/sprintf.c b/mware/sprintf.c
index 2950727f..6ce8e0da 100755
--- a/mware/sprintf.c
+++ b/mware/sprintf.c
@@ -13,6 +13,12 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -39,7 +45,7 @@
 
 #include <mware/formatwr.h>
 #include <mware/pgm.h>
-#include "compiler.h"
+#include <cfg/compiler.h>
 
 #include <stdio.h>
 
@@ -61,15 +67,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;
 }
@@ -118,15 +129,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;