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

fix secure_crt (was missing tchar redirection for printf_s and fopen_s)

Browse Source 
This was SVN commit r5078.
This commit is contained in:
janwas 2007-05-16 22:33:53 +00:00
parent 4083e1ff48
commit c8555a708a
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/lib/secure_crt.cpp
View File

@ -42,6 +42,10 @@ AT_STARTUP(\
# define tcat_s wcscat_s
# define tcmp wcscmp
# define tcpy wcscpy
# define tprintf_s swprintf_s
# define vtnprintf vswprintf // private
# define tfopen_s _wfopen_s
# define tfopen _wfopen // private
#else
# define tchar char
# define T(string_literal) string_literal
@ -52,6 +56,10 @@ AT_STARTUP(\
# define tcat_s strcat_s
# define tcmp strcmp
# define tcpy strcpy
# define tprintf_s sprintf_s
# define vtnprintf vsnprintf // private
# define tfopen_s fopen_s
# define tfopen fopen // private
#endif // #ifdef WSECURE_CRT
@ -205,20 +213,20 @@ int tcat_s(tchar* dst, size_t max_dst_chars, const tchar* src)
int sprintf_s(char* buf, size_t max_chars, const char* fmt, ...)
int tprintf_s(tchar* buf, size_t max_chars, const tchar* fmt, ...)
{
va_list args;
va_start(args, fmt);
int len = vsnprintf(buf, max_chars, fmt, args);
int len = vtnprintf(buf, max_chars, fmt, args);
va_end(args);
return len;
}
errno_t fopen_s(FILE** pfile, const char* filename, const char* mode)
errno_t tfopen_s(FILE** pfile, const tchar* filename, const tchar* mode)
{
*pfile = NULL;
FILE* file = fopen(filename, mode);
FILE* file = tfopen(filename, mode);
if(!file)
return ENOENT;
*pfile = file;

2
source/lib/secure_crt.h
View File

@ -70,9 +70,11 @@ extern int wcscat_s(wchar_t* dst, size_t max_dst_chars, const wchar_t* src);
extern int sprintf_s(char* buf, size_t max_chars, const char* fmt, ...);
extern int swprintf_s(wchar_t* buf, size_t max_chars, const wchar_t* fmt, ...);
typedef int errno_t;
extern errno_t fopen_s(FILE** pfile, const char* filename, const char* mode);
extern errno_t _wfopen_s(FILE** pfile, const wchar_t* filename, const wchar_t* mode);
#define fscanf_s fscanf