From 120f57b865b22089b8a359dc6593a092319d2478 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 13 Jan 2007 13:06:18 +0000 Subject: (svn r8089) -[win32] MS-borkedness: All *nprintf functions are broken, but we didn't test to fix it ourselves when 'len = count'. --- src/string.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/string.cpp b/src/string.cpp index 4556ac64b..eeca3e809 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -160,11 +160,16 @@ int CDECL snprintf(char *str, size_t size, const char *format, ...) } #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 */ -- cgit v1.2.3-70-g09d2