From 6b325192ae0a7764c231f1c5b7a4cee3f240f0a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 May 2015 22:03:39 +0000 Subject: even less mir_strncat() git-svn-id: http://svn.miranda-ng.org/main/trunk@13903 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HTTPServer/src/IndexHTML.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/HTTPServer/src/IndexHTML.cpp') diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp index a2ae11602f..fb554acd65 100644 --- a/plugins/HTTPServer/src/IndexHTML.cpp +++ b/plugins/HTTPServer/src/IndexHTML.cpp @@ -62,8 +62,7 @@ bool LoadIndexHTMLTemplate() { char szDestBuf[10000]; char* pszDestBuf = szDestBuf; - strncpy(pszBuf, szPluginPath, SIZEOF(szBuf)-1); - mir_strncat(pszBuf, szIndexHTMLTemplateFile, SIZEOF(szBuf) - mir_strlen(szBuf)); + mir_snprintf(szBuf, _countof(szBuf), "%s%s", szPluginPath, szIndexHTMLTemplateFile); HANDLE hFile = CreateFile(pszBuf, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -283,8 +282,7 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath, // check if directory exists char szMask[MAX_PATH]; - strncpy(szMask, pszRealPath, MAX_PATH- 1); - mir_strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask)); + mir_snprintf(szMask, _countof(szMask), "%s%s", pszRealPath, "*"); WIN32_FIND_DATAA fdFindFileData; HANDLE hFind = FindFirstFile(szMask, &fdFindFileData); -- cgit v1.2.3