From d5ee0fc23bdc1a194774591eb4ce63b8bebb8d6e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 17:01:01 +0000 Subject: replace strncat to mir_strncat git-svn-id: http://svn.miranda-ng.org/main/trunk@13780 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/extBackg.cpp | 2 +- plugins/Clist_nicer/src/viewmodes.cpp | 4 ++-- plugins/CmdLine/MimCmd/src/commands.cpp | 8 +++---- plugins/CmdLine/src/mimcmd_handlers.cpp | 32 ++++++++++++++-------------- plugins/DbEditorPP/src/findwindow.cpp | 2 +- plugins/ExternalAPI/m_folders.h | 4 ++-- plugins/FloatingContacts/src/filedrop.cpp | 2 +- plugins/HTTPServer/src/IndexHTML.cpp | 4 ++-- plugins/HTTPServer/src/IndexXML.cpp | 4 ++-- plugins/IEView/src/HistoryHTMLBuilder.cpp | 2 +- plugins/IEView/src/MUCCHTMLBuilder.cpp | 2 +- plugins/IEView/src/ScriverHTMLBuilder.cpp | 2 +- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 2 +- plugins/IEView/src/TemplateHTMLBuilder.cpp | 2 +- plugins/MirOTR/src/dbfilter.cpp | 6 +++--- plugins/Non-IM Contact/src/contactinfo.cpp | 4 ++-- plugins/Non-IM Contact/src/namereplacing.cpp | 26 +++++++++++----------- plugins/SecureIM/src/crypt_lists.cpp | 2 +- plugins/YahooGroups/src/services.cpp | 8 +++---- 19 files changed, 59 insertions(+), 59 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 6466404b47..bf285973c1 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -290,7 +290,7 @@ void LoadExtBkSettingsFromDB() mir_snprintf(p->szDBname, SIZEOF(p->szDBname), "EXBK_%s", accs[i]->szModuleName); if (i == 0) { mir_strncpy(p->szName, "{-}", SIZEOF(p->szName)); - strncat(p->szName, accs[i]->szModuleName, SIZEOF(p->szName) - mir_strlen(p->szName)); + mir_strncat(p->szName, accs[i]->szModuleName, SIZEOF(p->szName) - mir_strlen(p->szName)); } else mir_strncpy(p->szName, accs[i]->szModuleName, SIZEOF(p->szName)); p->statusID = ID_EXTBK_LAST; diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 5694204f0d..d3d6518959 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -345,8 +345,8 @@ void SaveState() item.cchTextMax = SIZEOF(szTemp); item.iItem = i; SendMessageA(hwndList, LVM_GETITEMA, 0, (LPARAM)&item); - strncat(newProtoFilter, szTemp, SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter)); - strncat(newProtoFilter, "|", SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter)); + mir_strncat(newProtoFilter, szTemp, SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter)); + mir_strncat(newProtoFilter, "|", SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter)); newProtoFilter[2047] = 0; } } diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp index c644dd7cc6..2cbdfe7430 100644 --- a/plugins/CmdLine/MimCmd/src/commands.cpp +++ b/plugins/CmdLine/MimCmd/src/commands.cpp @@ -141,11 +141,11 @@ void HandleHelpCommand(PCommand helpCommand, char *argv[], int argc, PReply repl for (int i = 0; i < cKnownCommands - 1; i++) { - strncat(reply->message, knownCommands[i].command, SIZEOF(reply->message) - mir_strlen(reply->message)); - strncat(reply->message, ", ", SIZEOF(reply->message) - mir_strlen(reply->message)); + mir_strncat(reply->message, knownCommands[i].command, SIZEOF(reply->message) - mir_strlen(reply->message)); + mir_strncat(reply->message, ", ", SIZEOF(reply->message) - mir_strlen(reply->message)); } - strncat(reply->message, knownCommands[cKnownCommands - 1].command, SIZEOF(reply->message) - mir_strlen(reply->message)); - strncat(reply->message, ".", SIZEOF(reply->message) - mir_strlen(reply->message)); + mir_strncat(reply->message, knownCommands[cKnownCommands - 1].command, SIZEOF(reply->message) - mir_strlen(reply->message)); + mir_strncat(reply->message, ".", SIZEOF(reply->message) - mir_strlen(reply->message)); } } diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index 70310a08b3..90c02c9d28 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -253,14 +253,14 @@ void HandleStatusCommand(PCommand command, TArgument *argv, int argc, PReply rep INT_PTR status = CallProtoService(accounts[i]->szModuleName, PS_GETSTATUS, 0, 0); PrettyStatusMode(status, pn, sizeof(pn)); - strncat(perAccountStatus, "\n", cPerAccountStatus - mir_strlen(perAccountStatus)); + mir_strncat(perAccountStatus, "\n", cPerAccountStatus - mir_strlen(perAccountStatus)); char *account = mir_u2a((wchar_t *) accounts[i]->tszAccountName); - strncat(perAccountStatus, account, cPerAccountStatus - mir_strlen(perAccountStatus)); + mir_strncat(perAccountStatus, account, cPerAccountStatus - mir_strlen(perAccountStatus)); mir_free(account); - strncat(perAccountStatus, ": ", cPerAccountStatus - mir_strlen(perAccountStatus)); - strncat(perAccountStatus, pn, cPerAccountStatus - mir_strlen(perAccountStatus)); + mir_strncat(perAccountStatus, ": ", cPerAccountStatus - mir_strlen(perAccountStatus)); + mir_strncat(perAccountStatus, pn, cPerAccountStatus - mir_strlen(perAccountStatus)); } } @@ -391,8 +391,8 @@ void HandleAwayMsgCommand(PCommand command, TArgument *argv, int argc, PReply re if (i != 0) { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); } else{ STRNCPY(reply->message, buffer, reply->cMessage); @@ -918,8 +918,8 @@ void HandleMessageCommand(PCommand command, TArgument *argv, int argc, PReply re STRNCPY(reply->message, buffer, reply->cMessage); } else { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); } } } @@ -1287,8 +1287,8 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe if (reply->message[0] != 0) { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); reply->message[reply->cMessage - 1] = 0; } else{ @@ -1455,8 +1455,8 @@ void HandleContactsCommand(PCommand command, TArgument *argv, int argc, PReply r mir_snprintf(buffer, SIZEOF(buffer), "%s:[%s]:%s (%08d)", contact, id, protocol, hContact); if (count) { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); } else{ STRNCPY(reply->message, buffer, reply->cMessage); @@ -1532,8 +1532,8 @@ void AddHistoryEvent(DBEVENTINFO *dbEvent, char *contact, PReply reply) if (reply->message[0] != 0) { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); } else{ STRNCPY(reply->message, buffer, reply->cMessage); @@ -1586,8 +1586,8 @@ void HandleHistoryCommand(PCommand command, TArgument *argv, int argc, PReply re mir_snprintf(buffer, SIZEOF(buffer), Translate("%s:%s - %d unread events."), contact, protocol, count); if (contacts > 0) { - strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); - strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message)); + mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message)); } else STRNCPY(reply->message, buffer, reply->cMessage); diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index 81bdbf880c..d05f2b8cef 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -247,7 +247,7 @@ char* multiReplace(const char* value, const char *find, const char *replace, int temp = (char*)mir_realloc(temp, mir_strlen(temp) + mir_strlen(string) + replen + 1); if (!temp) mir_tstrdup(value); - strncat(temp, string, (head - string)); + mir_strncat(temp, string, (head - string)); string = head + len; mir_strcat(temp, replace); diff --git a/plugins/ExternalAPI/m_folders.h b/plugins/ExternalAPI/m_folders.h index ae4930313b..271237e574 100644 --- a/plugins/ExternalAPI/m_folders.h +++ b/plugins/ExternalAPI/m_folders.h @@ -209,10 +209,10 @@ __inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, } if (path[0] != '\0') - strncat(path, "\\", size - mir_strlen(path)); + mir_strncat(path, "\\", size - mir_strlen(path)); if (fileName) - strncat(path, fileName, size - mir_strlen(path)); + mir_strncat(path, fileName, size - mir_strlen(path)); return res; } diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index d23bf5696a..f53edeba5b 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -289,7 +289,7 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) if ( NULL != strstr( szFile, "*.*" )) { szFile[ mir_strlen( szFile ) - 3 ] = '\0'; - strncat(szFile, fd.cFileName, nSize - mir_strlen(szFile)); + mir_strncat(szFile, fd.cFileName, nSize - mir_strlen(szFile)); } ppFiles[ *pnCount ] = szFile; diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp index 7df0e566fb..a2ae11602f 100644 --- a/plugins/HTTPServer/src/IndexHTML.cpp +++ b/plugins/HTTPServer/src/IndexHTML.cpp @@ -63,7 +63,7 @@ bool LoadIndexHTMLTemplate() { char* pszDestBuf = szDestBuf; strncpy(pszBuf, szPluginPath, SIZEOF(szBuf)-1); - strncat(pszBuf, szIndexHTMLTemplateFile, SIZEOF(szBuf) - mir_strlen(szBuf)); + mir_strncat(pszBuf, szIndexHTMLTemplateFile, SIZEOF(szBuf) - mir_strlen(szBuf)); HANDLE hFile = CreateFile(pszBuf, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -284,7 +284,7 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath, // check if directory exists char szMask[MAX_PATH]; strncpy(szMask, pszRealPath, MAX_PATH- 1); - strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask)); + mir_strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask)); WIN32_FIND_DATAA fdFindFileData; HANDLE hFind = FindFirstFile(szMask, &fdFindFileData); diff --git a/plugins/HTTPServer/src/IndexXML.cpp b/plugins/HTTPServer/src/IndexXML.cpp index 782cb289e2..7de9c2cc8b 100644 --- a/plugins/HTTPServer/src/IndexXML.cpp +++ b/plugins/HTTPServer/src/IndexXML.cpp @@ -65,7 +65,7 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath, const char * pszSrvPath, DWORD dwRemoteIP) { char szMask[MAX_PATH+1]; strncpy(szMask, pszRealPath, MAX_PATH); - strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask)); + mir_strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask)); WIN32_FIND_DATAA fdFindFileData; HANDLE hFind = FindFirstFile(szMask, &fdFindFileData); @@ -103,7 +103,7 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath, // check if a index.xsl exists in the same directory otherwise use the global strncpy(szMask, pszRealPath, MAX_PATH); - strncat(szMask, "index.xsl", SIZEOF(szMask) - mir_strlen(szMask)); + mir_strncat(szMask, "index.xsl", SIZEOF(szMask) - mir_strlen(szMask)); HANDLE hFileExists = CreateFile(szMask, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index 6fb213544a..03c083eaef 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -89,7 +89,7 @@ char *HistoryHTMLBuilder::timestampToString(time_t check) szResult[0] = '\0'; dbtts.szFormat = (char *)"d t"; CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); - strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); + mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); return szResult; } diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index 8059b9f9fe..dc34b47dca 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -114,7 +114,7 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check) dbtts.szFormat = (char *)""; } CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); - strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); + mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); return szResult; } diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index b876e8e1c8..fec5fa0aaf 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -172,7 +172,7 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod // CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, check, (LPARAM) & dbtts); CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); //_tcsncat(szResult, str, 500); - strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); + mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); } mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); return szResult; diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index 6972490e9e..d64d1851d7 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -194,7 +194,7 @@ char* TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG } } CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); - strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); + mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); return szResult; } diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index 9904272509..e63cfd2203 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -176,7 +176,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr return; mir_strcpy(tempBase, "file://"); - strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase)); + mir_strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase)); char *pathrun = tempBase + mir_strlen(tempBase); while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase)) pathrun--; diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp index fa65dd8ddc..b3078c0c8d 100644 --- a/plugins/MirOTR/src/dbfilter.cpp +++ b/plugins/MirOTR/src/dbfilter.cpp @@ -91,7 +91,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen); memset(newmsg, 0, alloclen+datalen); strncpy(newmsg, options.prefix, prefixlen); - strncat(newmsg, msg, alloclen - mir_strlen(newmsg)); + mir_strncat(newmsg, msg, alloclen - mir_strlen(newmsg)); // append additional data if (datalen) { memcpy(newmsg+alloclen, msg+len2, datalen); @@ -130,7 +130,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen+datalen); memset(newmsg, 0, alloclen+datalen); strncpy(newmsg, prefix, prefixlen); - strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg)); + mir_strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg)); wchar_t *p = (wchar_t*) newmsg + (msglen + prefixlen + 1); wcsncpy(p, prefixw, prefixlenw); wcsncat(p, msgw, msglenw - mir_wstrlen(p)); @@ -158,7 +158,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen+datalen); memset(newmsg, 0, alloclen+datalen); strncpy(newmsg, prefix, prefixlen); - strncat(newmsg, msg, msglen - mir_strlen(newmsg)); + mir_strncat(newmsg, msg, msglen - mir_strlen(newmsg)); mir_free(prefix); // append additional data if (datalen) { diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp index ea085b986c..3b037b3159 100644 --- a/plugins/Non-IM Contact/src/contactinfo.cpp +++ b/plugins/Non-IM Contact/src/contactinfo.cpp @@ -280,7 +280,7 @@ char* copyReplaceString(char* oldStr, char* newStr, char* findStr, char* replace i += (int)mir_strlen(findStr); } else { - strncat(newStr, &oldStr[i], 1); + mir_strncat(newStr, &oldStr[i], 1); i++; } } @@ -536,7 +536,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) fgets(line, 2000, file); } // the line that has the - strncat(tooltip, line, SIZEOF(tooltip) - mir_strlen(tooltip)); + mir_strncat(tooltip, line, SIZEOF(tooltip) - mir_strlen(tooltip)); } else if (!strncmp(line, "Icon=", mir_strlen("Icon="))) { i = (int)mir_strlen("Icon="); diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index a1737b6eda..3028cf5f2c 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -223,10 +223,10 @@ void checkStringForcompare(char *str) mir_strcat(newStr, X); else mir_strcat(newStr, Y); } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -249,10 +249,10 @@ void checkStringForSave(MCONTACT hContact, char* str) if (A && B) db_set_s(hContact, MODNAME, A, B); - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -278,10 +278,10 @@ void checkStringForLoad(MCONTACT hContact, char* str) db_free(&dbv); } } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -323,10 +323,10 @@ void checkStringForSaveN(char* str) break; } } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -366,10 +366,10 @@ void checkStringForLoadN(char* str) db_free(&dbv); } } - else strncat(newStr, &str[i], i); + else mir_strncat(newStr, &str[i], i); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -524,7 +524,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) else { // only copying from 1 line if (startLine == endLine) - strncat(newString, &fileContents[startLine][startChar], endChar - startChar); + mir_strncat(newString, &fileContents[startLine][startChar], endChar - startChar); else { int i; // copy the whole first line from startChar @@ -534,7 +534,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) mir_strcat(newString, fileContents[i]); } // copy the last line untill endChar - strncat(newString, fileContents[endLine], endChar); + mir_strncat(newString, fileContents[endLine], endChar); } } } @@ -558,7 +558,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) positionInOldString += lastChecked(newString, &oldString[positionInOldString]); } else { - strncat(newString, &oldString[positionInOldString], 1); + mir_strncat(newString, &oldString[positionInOldString], 1); positionInOldString++; } } diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index 40204b4789..28557fd1af 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -30,7 +30,7 @@ void loadSupportedProtocols() SupPro *p = (SupPro*)mir_calloc(sizeof(SupPro)); p->name = mir_strdup(protos[i]->szModuleName); if (szNames && p->name) { - char tmp[128]; strncpy(tmp, p->name, sizeof(tmp) - 1); strncat(tmp, ":", SIZEOF(tmp) - mir_strlen(tmp)); + char tmp[128]; strncpy(tmp, p->name, sizeof(tmp) - 1); mir_strncat(tmp, ":", SIZEOF(tmp) - mir_strlen(tmp)); LPSTR szName = strstr(szNames, tmp); if (szName) { szName = strchr(szName, ':'); diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp index 75b4e8f75f..a5a0b01cfd 100644 --- a/plugins/YahooGroups/src/services.cpp +++ b/plugins/YahooGroups/src/services.cpp @@ -126,8 +126,8 @@ void CreateGroup(char *group) *p = 0; if (mir_strlen(buffer) > 0) { - strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); - strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); + mir_strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); + mir_strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); } else{ strncpy_s(buffer, sub, _TRUNCATE); @@ -146,8 +146,8 @@ void CreateGroup(char *group) { if (mir_strlen(buffer) > 0) { - strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); - strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); + mir_strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); + mir_strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); } else{ strncpy_s(buffer, sub, _TRUNCATE); -- cgit v1.2.3