sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Workaround for limitations of Android's vswprintf implementation.

Browse Source 
Based on patch by BogDan. Refs #2996.

This was SVN commit r16203.
This commit is contained in:
Ykkrosh 2015-01-23 20:38:13 +00:00
parent b64ff8d09a
commit ad3e330861
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/secure_crt.cpp
View File

@ -32,6 +32,10 @@
#include "lib/secure_crt.h"
#if OS_ANDROID
# include <boost/algorithm/string/replace.hpp>
#endif
// we were included from wsecure_crt.cpp; skip all stuff that
// must only be done once.
#ifndef WSECURE_CRT
@ -127,6 +131,16 @@ size_t tnlen(const tchar* str, size_t max_len)
}
#endif // !OS_UNIX
#if OS_ANDROID
static std::wstring androidFormat(const tchar *fmt)
{
// FIXME handle %%hs, %%ls, etc
std::wstring ret(fmt);
boost::algorithm::replace_all(ret, L"%ls", L"%S");
boost::algorithm::replace_all(ret, L"%hs", L"%s");
return ret;
}
#endif
// copy at most <max_src_chars> (not including trailing null) from
// <src> into <dst>, which must not overlap.
@ -236,7 +250,11 @@ int tvsprintf_s(tchar* dst, size_t max_dst_chars, const tchar* fmt, va_list ap)
return -1;
}
#if OS_ANDROID
const int ret = tvsnprintf(dst, max_dst_chars, androidFormat(fmt).c_str(), ap);
#else
const int ret = tvsnprintf(dst, max_dst_chars, fmt, ap);
#endif
if(ret < 0 || ret >= int(max_dst_chars)) // not enough space
{
dst[0] = '\0';