speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make SD_snprintf() behave the same as snprintf()

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7662 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: e3d2c2a38f79b3301badc620eb1a97a78da38bfa
Former-commit-id: c399e5995194b188b7c172e2f2733fba7ea2d4da
This commit is contained in:
beaglejoe 2021-09-17 13:56:10 +00:00
parent 7435c13391
commit 9325947c57
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libs/portability/portability.cpp
View file

@ -73,24 +73,17 @@ char *strtok_r(char *str, const char *delim, char **nextp)
// Ticket #663 - MSVC implementation of snprintf prior to VS 2015 is not safe
// We provide our own version of the function,
// that ensures 0 ending for the string.
//
// See http://msdn.microsoft.com/en-us/library/d3xd30zz(v=vs.80).aspx
//
// "Each of these functions takes a pointer to an argument list,
// then formats and writes up to count characters of the given data
// to the memory pointed to by buffer and appends a terminating null.
// If count is _TRUNCATE, then these functions write as much of the
// string as will fit in buffer while leaving room for a terminating
// null. If the entire string (with terminating null) fits in buffer,
// then these functions return the number of characters written
// (not including the terminating null); otherwise, these functions
// return -1 to indicate that truncation occurred."
// and returns the number of bytes written to the str
// or if the str is not large enough, the function writes as much
// as possible and returns the number of bytes that WOULD have
// been written had str been large enough. ie: the needed buffer size
#if _MSC_VER && _MSC_VER < 1900
int SD_snprintf(char *str, size_t size, const char *format, ...)
{
va_list vaArgs;
va_start(vaArgs, format);
int len = _vsnprintf_s(str, size, _TRUNCATE, format, vaArgs);
int len = vsnprintf(str, size, format, vaArgs);
va_end(vaArgs);
if (size > 0)
str[size - 1] = 0;