xrGame: implement linux strncat_s()

OpenXRay · Nov 6, 2018 · a64b71f · a64b71f
1 parent da8fdce
commit a64b71f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -312,6 +312,7 @@ inline bool strncpy_s(char * dest, const char * source, size_t num) {
 inline int strcpy_s(char *dest, const char *source) { return (int)(NULL == strcpy(dest, source)); }
 inline int strcpy_s(char *dest, size_t num, const char *source) { return (int)(NULL == strcpy(dest, source)); }
 inline int strcat_s(char * dest, size_t size, const char * source) { return (NULL == strcat(dest, source)); }
+inline int strncat_s(char * dest, size_t size, const char * source, size_t count) { return (NULL == strncat(dest, source, count)); }
 
 #define _vsnprintf vsnprintf
 #define vsprintf_s(dest, size, format, args) vsprintf(dest, format, args)

diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp
@@ -383,10 +383,8 @@ void CUITalkWnd::PlaySnd(LPCSTR text)
     }
 
     strncpy_s(fn, sizeof(fn), path, xr_strlen(path));
-#ifndef LINUX // FIXME!!!
     strncat_s(fn, sizeof(fn), text, text_len);
     strncat_s(fn, sizeof(fn), ext, xr_strlen(ext));
-#endif
 
     //	strconcat( sizeof(fn), fn, "characters_voice" DELIMITER "dialogs" DELIMITER, text2, ".ogg" );