changeset 5630:e33e8fe4c97d draft

(svn r8089) -[win32] MS-borkedness: All *nprintf functions are broken, but we didn't test to fix it ourselves when 'len = count'.
author Darkvater <Darkvater@openttd.org>
date Sat, 13 Jan 2007 13:06:18 +0000
parents 2fc976e3e64f
children a4256b891a79
files src/string.cpp
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -160,11 +160,16 @@
 }
 
 #ifdef _MSC_VER
+/* *nprintf broken, not POSIX compliant, MSDN description
+ * - If len < count, then len characters are stored in buffer, a null-terminator is appended, and len is returned.
+ * - If len = count, then len characters are stored in buffer, no null-terminator is appended, and len is returned.
+ * - If len > count, then count characters are stored in buffer, no null-terminator is appended, and a negative value is returned
+ */
 int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
 	int ret;
 	ret = _vsnprintf(str, size, format, ap);
-	if (ret < 0) str[size - 1] = '\0';
+	if (ret < 0 || ret == 0) str[size - 1] = '\0';
 	return ret;
 }
 #endif /* _MSC_VER */