From f2de79cb2eb8247548650ee80d75be109ac66ee7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 16:25:49 +0000 Subject: replace strcat to mir_strcat git-svn-id: http://svn.miranda-ng.org/main/trunk@13777 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AssocMgr/src/test.cpp | 4 +-- plugins/ChangeKeyboardLayout/src/hook_events.cpp | 2 +- plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/CmdLine/MimCmd/src/commands.cpp | 2 +- plugins/CmdLine/src/utils.cpp | 2 +- plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 2 +- plugins/DbEditorPP/src/exportimport.cpp | 6 ++-- plugins/DbEditorPP/src/findwindow.cpp | 4 +-- plugins/DbEditorPP/src/main.cpp | 2 +- plugins/DbEditorPP/src/settinglist.cpp | 4 +-- plugins/DbEditorPP/src/watchedvars.cpp | 2 +- plugins/Exchange/src/utils.cpp | 2 +- plugins/FloatingContacts/src/filedrop.cpp | 4 +-- plugins/GmailNotifier/src/notify.cpp | 4 +-- plugins/HTTPServer/src/GuiElements.cpp | 4 +-- plugins/HTTPServer/src/IndexHTML.cpp | 2 +- plugins/HTTPServer/src/MimeHandling.cpp | 2 +- plugins/HTTPServer/src/main.cpp | 4 +-- plugins/IEHistory/src/stdafx.h | 2 +- plugins/IEHistory/src/utils.cpp | 2 +- plugins/IEView/src/Options.cpp | 4 +-- plugins/IEView/src/ScriverHTMLBuilder.cpp | 8 +++--- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 4 +-- plugins/IEView/src/TemplateHTMLBuilder.cpp | 2 +- plugins/MenuItemEx/src/main.cpp | 2 +- plugins/MirOTR/src/svcs_proto.cpp | 2 +- plugins/New_GPG/src/main.cpp | 2 +- plugins/Non-IM Contact/src/contactinfo.cpp | 32 +++++++++++----------- plugins/Non-IM Contact/src/namereplacing.cpp | 24 ++++++++-------- plugins/RemovePersonalSettings/src/rps.cpp | 4 +-- plugins/SecureIM/src/mmi.cpp | 4 +-- plugins/SecureIM/src/options.cpp | 2 +- plugins/SecureIM/src/splitmsg.cpp | 2 +- plugins/SecureIM/src/svcs_proto.cpp | 4 +-- plugins/SeenPlugin/src/history.cpp | 4 +-- plugins/Spamotron/src/bayes.cpp | 6 ++-- plugins/Spamotron/src/options.cpp | 8 +++--- plugins/Spamotron/src/spamotron.cpp | 6 ++-- plugins/StatusPlugins/StartupStatus/options.cpp | 2 +- plugins/TopToolBar/src/common.h | 2 +- plugins/Watrack_MPD/src/main.cpp | 4 +-- plugins/Weather/src/weather_conv.cpp | 2 +- plugins/WebView/src/main.cpp | 16 +++++------ plugins/WhenWasIt/src/utils.cpp | 2 +- plugins/YahooGroups/src/utils.cpp | 2 +- 46 files changed, 105 insertions(+), 105 deletions(-) (limited to 'plugins') diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 0163adee36..5640a5ce18 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -367,7 +367,7 @@ static int IcqFilesModulesLoaded(WPARAM wParam,LPARAM lParam) char szService[MAX_PATH+32]; UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(lParam); - strcat(mir_strcpy(szService,gpszICQProtoName),"OpenFile"); + mir_strcat(mir_strcpy(szService,gpszICQProtoName),"OpenFile"); /* .icq files are not used, just by the ProtoLink plugin */ //AssocMgr_AddNewFileTypeT(".icq","application/x-icq",TranslateT("ICQ link shortcut"),TranslateT("&Add to contact list..."),hInst,IDI_ICQ,szService,FTDF_BROWSERAUTOOPEN|FTDF_ISTEXT|FTDF_ISSHORTCUT|FTDF_DEFAULTDISABLED); AssocMgr_AddNewFileTypeT(".uin","application/x-icq",TranslateT("ICQ link shortcut"),TranslateT("&Add to contact list..."),hInst,IDI_ICQ,szService,FTDF_BROWSERAUTOOPEN|FTDF_ISTEXT|FTDF_ISSHORTCUT); @@ -377,7 +377,7 @@ static int IcqFilesModulesLoaded(WPARAM wParam,LPARAM lParam) void InitIcqFiles(void) { char szService[MAX_PATH+32]; - strcat(mir_strcpy(szService,gpszICQProtoName),"OpenFile"); + mir_strcat(mir_strcpy(szService,gpszICQProtoName),"OpenFile"); hServiceOpenFile=CreateServiceFunction(szService,IcqOpenFile); hHookModulesLoaded=HookEvent(ME_SYSTEM_MODULESLOADED,IcqFilesModulesLoaded); } diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 0e6a1eadf5..7471d02e78 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -77,7 +77,7 @@ void RegPopupActions() if (ServiceExists(MS_POPUP_ADDPOPUPT)) { poOptions.paActions[0].cbSize = sizeof(POPUPACTION); mir_strcpy(poOptions.paActions[0].lpzTitle, ModuleName); - strcat(poOptions.paActions[0].lpzTitle, "/Copy to clipboard"); + mir_strcat(poOptions.paActions[0].lpzTitle, "/Copy to clipboard"); poOptions.paActions[0].flags = PAF_ENABLED; poOptions.paActions[0].wParam = poOptions.paActions[0].lParam = 0; poOptions.paActions[0].lchIcon = hCopyIcon; diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index 832f59484f..49cfb9bd80 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -609,7 +609,7 @@ static int DBLoadFrameSettingsAtPos(int pos, int Frameid) _itoa(pos, sadd, 10); - //db_set_s(0, CLUIFrameModule,strcat("Name",sadd),Frames[Frameid].name); + //db_set_s(0, CLUIFrameModule,mir_strcat("Name",sadd),Frames[Frameid].name); //bool g_pfwFrames[Frameid].collapsed = db_get_b(0, CLUIFrameModule, AS(buf, "Collapse", sadd), g_pfwFrames[Frameid].collapsed); diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index a29c3d8673..6ce2df5ff9 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -404,7 +404,7 @@ char __forceinline *AS(char *str, const char *setting, char *addstr) { if (str != NULL) { mir_strcpy(str, setting); - strcat(str, addstr); + mir_strcat(str, addstr); } return str; } diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp index 3983aebdd2..c644dd7cc6 100644 --- a/plugins/CmdLine/MimCmd/src/commands.cpp +++ b/plugins/CmdLine/MimCmd/src/commands.cpp @@ -48,7 +48,7 @@ int ConnectToMiranda() { char pluginPath[1024]; GetMirandaFolder(pluginPath, sizeof(pluginPath)); - strcat(pluginPath, "\\plugins\\cmdline.dll"); + mir_strcat(pluginPath, "\\plugins\\cmdline.dll"); ListCommands = NULL; diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index 7dd7d8477b..b7dce2a279 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -57,7 +57,7 @@ int Log(char *format, ...) va_end(vararg); if (str[mir_strlen(str) - 1] != '\n') { - strcat(str, "\n"); + mir_strcat(str, "\n"); } fputs(str, fout); fclose(fout); diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp index 95f7f6dda1..4a4cdc8cd8 100644 --- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp +++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp @@ -232,7 +232,7 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l for (j = 0; j < len; j++) { mir_snprintf(tmp, SIZEOF(tmp), "%02X ", (BYTE)p[j]); - strcat(data, tmp); + mir_strcat(data, tmp); } SetWindowText(hwnd, Translate("Edit BLOB value")); diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp index 8618de7a97..9c07ce46b7 100644 --- a/plugins/DbEditorPP/src/exportimport.cpp +++ b/plugins/DbEditorPP/src/exportimport.cpp @@ -92,7 +92,7 @@ void exportModule(MCONTACT hContact, char *module, FILE *file) for (int j = 0; j < dbv.cpbVal; j++) { char tmp[16]; mir_snprintf(tmp, SIZEOF(tmp), "%02X ", (BYTE)dbv.pbVal[j]); - strcat(data, tmp); + mir_strcat(data, tmp); } fprintf(file, "\n%s=n%s", setting->name, data); mir_free(data); @@ -559,12 +559,12 @@ void ImportSettingsFromFileMenuItem(MCONTACT hContact, char* FilePath) if ((DWORD)mir_strlen(szFileNames) < offset) { index += offset; strncpy(szPath, szFileNames, offset); - strcat(szPath, "\\"); + mir_strcat(szPath, "\\"); } while (szFileNames[index]) { mir_strcpy(szFile, szPath); - strcat(szFile, &szFileNames[index]); + mir_strcat(szFile, &szFileNames[index]); index += (int)mir_strlen(&szFileNames[index]) + 1; HANDLE hFile = CreateFile(szFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index 29962130c5..81bdbf880c 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -249,11 +249,11 @@ char* multiReplace(const char* value, const char *find, const char *replace, int strncat(temp, string, (head - string)); string = head + len; - strcat(temp, replace); + mir_strcat(temp, replace); head = (cs ? strstr(string, find) : StrStrI(string, find)); } - strcat(temp, string); + mir_strcat(temp, string); return temp; } diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 78c640a78e..b8b97cec80 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -487,7 +487,7 @@ WCHAR* GetContactName(MCONTACT hContact, const char *szProto, int unicode) if (unicode) wcscat(res, L" "); else - strcat((char*)res, " "); + mir_strcat((char*)res, " "); len++; } diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp index cd27631faa..a0f080a974 100644 --- a/plugins/DbEditorPP/src/settinglist.cpp +++ b/plugins/DbEditorPP/src/settinglist.cpp @@ -123,7 +123,7 @@ void additem(HWND hwnd2Settings, MCONTACT hContact, char* module, char* setting, for (int j = 0; j < dbv.cpbVal; j++) { char tmp[16]; mir_snprintf(tmp, SIZEOF(tmp), "%02X ", (BYTE)dbv.pbVal[j]); - strcat(data, tmp); + mir_strcat(data, tmp); } lvi.iImage = 0; ListView_SetItem(hwnd2Settings, &lvi); @@ -625,7 +625,7 @@ void EditLabel(HWND hwnd2List, int item, int subitem) for (j = 0; j < dbv.cpbVal; j++) { mir_snprintf(tmp, SIZEOF(tmp), "%02X ", (BYTE)dbv.pbVal[j]); - strcat(data, tmp); + mir_strcat(data, tmp); } info->hwnd2Edit = CreateWindow("EDIT", data, WS_BORDER | WS_VISIBLE | WS_CHILD | WS_VSCROLL | ES_MULTILINE, rc.left, rc.top, (int)((rc.right - rc.left)*1.5), (rc.bottom - rc.top) * 3, hwnd2List, 0, hInst, 0); diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index 44c2f801a4..7474835c98 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -93,7 +93,7 @@ void addwatchtolist(HWND hwnd2list, struct DBsetting *lParam) { char tmp[16]; mir_snprintf(tmp, SIZEOF(tmp), "%02X ", (BYTE)dbv->pbVal[j]); - strcat(data, tmp); + mir_strcat(data, tmp); } ListView_SetItemText(hwnd2list, index, 4, data); ListView_SetItemText(hwnd2list, index, 3, "BLOB"); diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index 0cda52c2df..e89a170732 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -58,7 +58,7 @@ int Log(char*, ...) va_end(vararg); if (str[mir_strlen(str) - 1] != '\n') { - strcat(str, "\n"); + mir_strcat(str, "\n"); } fputs(str, fout); fclose(fout); diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index 7a0f40adfc..d23bf5696a 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -230,7 +230,7 @@ static int CountFiles( char *szItem ) } ++nCount; - strcat( szDirName, "\\*.*" ); + mir_strcat( szDirName, "\\*.*" ); nCount += CountFiles( szDirName ); } } @@ -274,7 +274,7 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) ppFiles[ *pnCount ] = _strdup( szDirName ); ++( *pnCount ); - strcat( szDirName, "\\*.*" ); + mir_strcat( szDirName, "\\*.*" ); SaveFiles( szDirName, ppFiles, pnCount ); } diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp index b071fff079..b8f426da7f 100644 --- a/plugins/GmailNotifier/src/notify.cpp +++ b/plugins/GmailNotifier/src/notify.cpp @@ -106,8 +106,8 @@ void NotifyUser(Account *curAcc) mir_strcpy(ppd.lpzContactName, curAcc->results.content); resultLink *prst = curAcc->results.next; for (int i = 0; i < 5 && i < newMails; i++) { - strcat(ppd.lpzText, prst->content); - strcat(ppd.lpzText, "\n"); + mir_strcat(ppd.lpzText, prst->content); + mir_strcat(ppd.lpzText, "\n"); prst = prst->next; } ppd.colorBack = opt.popupBgColor; diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index d936a59018..b2b67837ee 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -322,7 +322,7 @@ UINT_PTR CALLBACK ShareNewFileDialogHook( memmove(&szSelection[1], pszFolder, mir_strlen(pszFolder) + 1); szSelection[0] = '/'; if (szSelection[mir_strlen(szSelection)-1] != '/') - strcat(szSelection, "/"); + mir_strcat(szSelection, "/"); // only write to IDC_SHARE_NAME when a file / other folder was selected before if (!mir_strcmp(szSelection, pstShare->pszSrvPath)) @@ -353,7 +353,7 @@ UINT_PTR CALLBACK ShareNewFileDialogHook( if (pszTmp) { *pszTmp = '\0'; if (pstShare->pszSrvPath[mir_strlen(pstShare->pszSrvPath)-1] != '/') - strcat(pstShare->pszSrvPath, "/"); + mir_strcat(pstShare->pszSrvPath, "/"); } else { if (pstShare->pszSrvPath[mir_strlen(pstShare->pszSrvPath)-1] == '/') pstShare->pszSrvPath[mir_strlen(pstShare->pszSrvPath)-1] = '\0'; diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp index 222e1bca5c..7df0e566fb 100644 --- a/plugins/HTTPServer/src/IndexHTML.cpp +++ b/plugins/HTTPServer/src/IndexHTML.cpp @@ -376,7 +376,7 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath, *pszTmp = '+';*/ if (*pszPos == SY_FOR_DIRS) { // For Directories - strcat(szURL, "/"); + mir_strcat(szURL, "/"); } else { // For Files iFileSize = fdFindFileData.nFileSizeLow; ftFileCreateTime = fdFindFileData.ftCreationTime; diff --git a/plugins/HTTPServer/src/MimeHandling.cpp b/plugins/HTTPServer/src/MimeHandling.cpp index 12a45f1946..85aa0a1312 100644 --- a/plugins/HTTPServer/src/MimeHandling.cpp +++ b/plugins/HTTPServer/src/MimeHandling.cpp @@ -16,7 +16,7 @@ int bInitMimeHandling() { char szBuf[10000]; mir_strcpy(szBuf, szPluginPath); - strcat(szBuf, szMimeTypeConfigFile); + mir_strcat(szBuf, szMimeTypeConfigFile); mimeDB = fopen(szBuf, "r"); if (mimeDB != NULL) { diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 5923287f17..9d596d3b10 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -230,7 +230,7 @@ bool bReadConfigurationFile() { char szBuf[1000]; mir_strcpy(szBuf, szPluginPath); - strcat(szBuf, szConfigFile); + mir_strcat(szBuf, szConfigFile); HANDLE hFile = CreateFile(szBuf, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -330,7 +330,7 @@ bool bWriteConfigurationFile() { CLFileShareListAccess clCritSection; char szBuf[1000]; mir_strcpy(szBuf, szPluginPath); - strcat(szBuf, szConfigFile); + mir_strcat(szBuf, szConfigFile); HANDLE hFile = CreateFile(szBuf, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { TCHAR temp[200]; diff --git a/plugins/IEHistory/src/stdafx.h b/plugins/IEHistory/src/stdafx.h index cfc7fc60d1..daaa9d2916 100644 --- a/plugins/IEHistory/src/stdafx.h +++ b/plugins/IEHistory/src/stdafx.h @@ -61,7 +61,7 @@ static FILE* fopen_s2(const char* file,const char* mode){ return ret; } #define fopen fopen_s2 -#define strcat strcat_s +#define mir_strcat strcat_s #define _vsnprintf _vsnprintf_s #define snprintf _snprintf_s #define snwprintf _snwprintf_s diff --git a/plugins/IEHistory/src/utils.cpp b/plugins/IEHistory/src/utils.cpp index 1e77aac420..d1f7f704bf 100644 --- a/plugins/IEHistory/src/utils.cpp +++ b/plugins/IEHistory/src/utils.cpp @@ -49,7 +49,7 @@ int Log(char *format, ...) va_end(vararg); if (str[mir_strlen(str) - 1] != '\n') { - strcat(str, "\n"); + mir_strcat(str, "\n"); } fputs(str, fout); fclose(fout); diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 6b183d236b..fb4aa2b3fd 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -386,8 +386,8 @@ static void RefreshProtoList(HWND hwndDlg, int mode, bool protoTemplates) } else { CallProtoService(proto->getProtocolName(), PS_GETNAME, sizeof(protoName), (LPARAM)protoName); - // strcat(protoName, " "); - // strcat(protoName, Translate("protocol")); + // mir_strcat(protoName, " "); + // mir_strcat(protoName, Translate("protocol")); } tvi.item.pszText = mir_a2t(protoName); tvi.item.lParam = (LPARAM)proto; diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index ed336a4eea..b876e8e1c8 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -146,13 +146,13 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod if (dwFlags & SMF_LOG_USERELATIVEDATE && check >= today) { strncpy(szResult, Translate("Today"), SIZEOF(szResult)-1); if (mode == 0) { - strcat(szResult, ","); + mir_strcat(szResult, ","); } } else if (dwFlags & SMF_LOG_USERELATIVEDATE && check > (today - 86400)) { strncpy(szResult, Translate("Yesterday"), SIZEOF(szResult)-1); if (mode == 0) { - strcat(szResult, ","); + mir_strcat(szResult, ","); } } else { @@ -164,9 +164,9 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod } if (mode == 0 || mode == 2) { if (mode == 0 && (dwFlags & SMF_LOG_SHOWDATE)) { - strcat(format, " "); + mir_strcat(format, " "); } - strcat(format, (dwFlags & SMF_LOG_SHOWSECONDS) ? "s" : "t"); + mir_strcat(format, (dwFlags & SMF_LOG_SHOWSECONDS) ? "s" : "t"); } if (format[0] != '\0') { // CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, check, (LPARAM) & dbtts); diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index e9c6b01faf..6972490e9e 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -178,12 +178,12 @@ char* TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG if (dwFlags & MWF_LOG_USERELATIVEDATES && check >= today) { dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t"; mir_strcpy(szResult, Translate("Today")); - strcat(szResult, ", "); + mir_strcat(szResult, ", "); } else if (dwFlags & MWF_LOG_USERELATIVEDATES && check > (today - 86400)) { dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t"; mir_strcpy(szResult, Translate("Yesterday")); - strcat(szResult, ", "); + mir_strcat(szResult, ", "); } else { if (dwFlags & MWF_LOG_LONGDATES) diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index a6c92a6311..5c6269aa8e 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -347,7 +347,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, TemplateMap *tmpm = getTemplateMap(protoSettings); if (tmpm != NULL) { mir_strcpy(tempBase, "file://"); - strcat(tempBase, tmpm->getFilename()); + mir_strcat(tempBase, tmpm->getFilename()); char* pathrun = tempBase + mir_strlen(tempBase); while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase)) pathrun--; pathrun++; diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 3ace9e85a8..d8e9075956 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -345,7 +345,7 @@ void getIP(MCONTACT hContact, LPSTR szProto, LPSTR szIP) if (rIP) mir_snprintf(szrIP, SIZEOF(szrIP), "Internal IP: %d.%d.%d.%d\r\n", rIP >> 24, (rIP >> 16) & 0xFF, (rIP >> 8) & 0xFF, rIP & 0xFF); mir_strcpy(szIP, szrIP); - strcat(szIP, szmIP); + mir_strcat(szIP, szmIP); } LPTSTR getMirVer(MCONTACT hContact) diff --git a/plugins/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/src/svcs_proto.cpp index cff928a336..bb88823c04 100644 --- a/plugins/MirOTR/src/svcs_proto.cpp +++ b/plugins/MirOTR/src/svcs_proto.cpp @@ -140,7 +140,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam) size_t len = (mir_strlen(options.prefix)+mir_strlen(newmessage)+1)*sizeof(char); char* tmp = (char*)mir_alloc( len ); mir_strcpy(tmp, options.prefix); - strcat(tmp, newmessage); + mir_strcat(tmp, newmessage); msg_free(newmessage); newmessage = tmp; msg_free = mir_free; diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index e22b320f61..7cd8671bd8 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -933,7 +933,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, mir_free(tmp); char *mir_path = (char*)mir_alloc(sizeof(char) * MAX_PATH); PathToAbsolute("\\", mir_path); - strcat(mir_path, "\\gpg"); + mir_strcat(mir_path, "\\gpg"); if(_access(mir_path, 0) != -1) { tmp = mir_wstrdup(toUTF16(mir_path).c_str()); diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp index ccaa13d0b9..ea085b986c 100644 --- a/plugins/Non-IM Contact/src/contactinfo.cpp +++ b/plugins/Non-IM Contact/src/contactinfo.cpp @@ -276,7 +276,7 @@ char* copyReplaceString(char* oldStr, char* newStr, char* findStr, char* replace while (oldStr[i] != '\0') { // msg(&oldStr[i],""); if (!strncmp(&oldStr[i], findStr, mir_strlen(findStr))) { - strcat(newStr, replaceWithStr); + mir_strcat(newStr, replaceWithStr); i += (int)mir_strlen(findStr); } else { @@ -532,7 +532,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) mir_strcpy(tooltip, &line[i]); fgets(line, 2000, file); while (!strstr(line, "\r\n")) { - strcat(tooltip, line); + mir_strcat(tooltip, line); fgets(line, 2000, file); } // the line that has the @@ -561,27 +561,27 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) mir_snprintf(msg, size, "Do you want to import this Non-IM Contact?\r\n\r\nName: %s\r\n", name); if (program) { msg = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(program) + mir_strlen("Program: \r\n") + 1); - strcat(msg, "Program: "); - strcat(msg, program); - strcat(msg, "\r\n"); + mir_strcat(msg, "Program: "); + mir_strcat(msg, program); + mir_strcat(msg, "\r\n"); } if (programparam) { msg = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(programparam) + mir_strlen("Program Parameters: \r\n") + 1); - strcat(msg, "Program Parameters: "); - strcat(msg, programparam); - strcat(msg, "\r\n"); + mir_strcat(msg, "Program Parameters: "); + mir_strcat(msg, programparam); + mir_strcat(msg, "\r\n"); } if (tooltip) { msg = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(tooltip) + mir_strlen("ToolTip: \r\n") + 1); - strcat(msg, "ToolTip: "); - strcat(msg, tooltip); - strcat(msg, "\r\n"); + mir_strcat(msg, "ToolTip: "); + mir_strcat(msg, tooltip); + mir_strcat(msg, "\r\n"); } if (group) { msg = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(group) + mir_strlen("Group: \r\n") + 1); - strcat(msg, "Group: "); - strcat(msg, group); - strcat(msg, "\r\n"); + mir_strcat(msg, "Group: "); + mir_strcat(msg, group); + mir_strcat(msg, "\r\n"); } if (icon) { char tmp[64]; @@ -610,7 +610,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) char *msgtemp = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(tmp) + 1); if (msgtemp) { msg = msgtemp; - strcat(msg, tmp); + mir_strcat(msg, tmp); } } if (usetimer && timer) { @@ -622,7 +622,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) char *msgtemp = (char*)realloc(msg, mir_strlen(msg) + mir_strlen(tmp) + 1); if (msgtemp) { msg = msgtemp; - strcat(msg, tmp); + mir_strcat(msg, tmp); } } diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index f04e290da0..a1737b6eda 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -220,8 +220,8 @@ void checkStringForcompare(char *str) j = Y - ©OfStr[i] + (int)mir_strlen(Y) + 1; if (A && B && X && Y) { if (!mir_strcmp(A, B)) - strcat(newStr, X); - else strcat(newStr, Y); + mir_strcat(newStr, X); + else mir_strcat(newStr, Y); } else strncat(newStr, &str[i], j); i += j; @@ -274,7 +274,7 @@ void checkStringForLoad(MCONTACT hContact, char* str) if (A) { DBVARIANT dbv; if (!db_get_s(hContact, MODNAME, A, &dbv)) { - strcat(newStr, dbv.pszVal); + mir_strcat(newStr, dbv.pszVal); db_free(&dbv); } } @@ -351,16 +351,16 @@ void checkStringForLoadN(char* str) if (!db_get(NULL, A, B, &dbv)) { switch (dbv.type) { case DBVT_BYTE: - strcat(newStr, _itoa(dbv.bVal, temp, 10)); + mir_strcat(newStr, _itoa(dbv.bVal, temp, 10)); break; case DBVT_WORD: - strcat(newStr, _itoa(dbv.wVal, temp, 10)); + mir_strcat(newStr, _itoa(dbv.wVal, temp, 10)); break; case DBVT_DWORD: - strcat(newStr, _itoa(dbv.dVal, temp, 10)); + mir_strcat(newStr, _itoa(dbv.dVal, temp, 10)); break; case DBVT_ASCIIZ: - strcat(newStr, dbv.pszVal); + mir_strcat(newStr, dbv.pszVal); break; } db_free(&dbv); @@ -425,7 +425,7 @@ int lastChecked(char *newStr, const char *str) if (GetLastWriteTime(hFile, tszFileName)) { CloseHandle(hFile); - strcat(newStr, tszFileName); + mir_strcat(newStr, tszFileName); mir_snprintf(tszFileName, SIZEOF(tszFileName), "%s%d))", szPattern, file); return (int)mir_strlen(tszFileName); } @@ -520,7 +520,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) if (!strstr(oldString, "start(")) startLine = endLine; if (!strstr(oldString, "end(")) endLine = startLine; // after all the options copy the line across and add 2 to positionInOldString for the file(print(....)) - if (wholeLine >= 0) strcat(newString, fileContents[wholeLine]); + if (wholeLine >= 0) mir_strcat(newString, fileContents[wholeLine]); else { // only copying from 1 line if (startLine == endLine) @@ -528,10 +528,10 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) else { int i; // copy the whole first line from startChar - strcat(newString, &fileContents[startLine][startChar]); + mir_strcat(newString, &fileContents[startLine][startChar]); // copy the middle lines across for (i = (startLine + 1); i < endLine; i++) { - strcat(newString, fileContents[i]); + mir_strcat(newString, fileContents[i]); } // copy the last line untill endChar strncat(newString, fileContents[endLine], endChar); @@ -548,7 +548,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) else { mir_snprintf(tempString, SIZEOF(tempString), "fn%d", tempInt); if (db_get_static(NULL, MODNAME, tempString, tempString, SIZEOF(tempString))) - strcat(newString, tempString); + mir_strcat(newString, tempString); else return ERROR_NO_FILE; positionInOldString += (int)mir_strlen(_itoa(tempInt, tempString, 10)) + 1; } diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index 0394d4d522..d15119b7f9 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -144,7 +144,7 @@ extern "C" int __declspec(dllexport) Load() *strTmp = '\0'; // Set vars - strcat(gMirandaDir, "\\"); + mir_strcat(gMirandaDir, "\\"); mir_strcpy(gIniFile, gMirandaDir); // Store last pos @@ -561,7 +561,7 @@ void DeleteFileOrFolder(const char *name) *strTmp = '\0'; } else { - strcat(tmp, "\\"); + mir_strcat(tmp, "\\"); strTmp = &tmp[mir_strlen(tmp)]; } diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 6e99874fd1..5f2c5a8896 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -52,7 +52,7 @@ char* m_aastrcat(LPCSTR strA, LPCSTR strB) int lenB = (int)mir_strlen(strB); LPSTR str = (LPSTR)mir_alloc((lenA + lenB + 1)*(sizeof(WCHAR) + 1)); mir_strcpy(str, strA); - strcat(str, strB); + mir_strcat(str, strB); MultiByteToWideChar(CP_ACP, 0, str, -1, (LPWSTR)(str + lenA + lenB + 1), (lenA + lenB + 1)*sizeof(WCHAR)); return str; } @@ -64,7 +64,7 @@ char* m_ustrcat(LPCSTR strA, LPCSTR strB) { SAFE_FREE(m_string); m_string = (LPSTR)mir_alloc(mir_strlen(strA) + mir_strlen(strB) + 1); - mir_strcpy(m_string, strA); strcat(m_string, strB); + mir_strcpy(m_string, strA); mir_strcat(m_string, strB); return m_string; } diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index afd32ada42..157ac96f8d 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1299,7 +1299,7 @@ void ApplyProtoSettings(HWND hDlg) p->inspecting = ListView_GetCheckState(hLV, i); char tmp[128]; mir_snprintf(tmp, SIZEOF(tmp), "%s:%d:%d:%d;", p->name, p->inspecting, p->tsplit_on, p->tsplit_off); - strcat(szNames, tmp); + mir_strcat(szNames, tmp); p->split_on = p->tsplit_on; p->split_off = p->tsplit_off; i = ListView_GetNextItem(hLV, i, LVNI_ALL); diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index 4fef281087..c502c5c16f 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -72,7 +72,7 @@ LPSTR combineMessage(pUinKey ptr, LPSTR szMsg) SAFE_FREE(ptr->tmp); ptr->tmp = (LPSTR)mir_alloc(len + 1); *(ptr->tmp) = '\0'; for (i = 0; i < part_all; i++) { - strcat(ptr->tmp, pm->message[i]); + mir_strcat(ptr->tmp, pm->message[i]); delete pm->message[i]; } delete pm->message; diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index 9b2a3cb669..e254f7b81e 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -112,7 +112,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) LPSTR tmp = (LPSTR)mir_alloc(mir_strlen(ptr->msgSplitted) + mir_strlen(szEncMsg) + 1); mir_strcpy(tmp, ptr->msgSplitted); - strcat(tmp, szEncMsg); + mir_strcat(tmp, szEncMsg); mir_free(ptr->msgSplitted); ptr->msgSplitted = szEncMsg = ppre->szMessage = tmp; ssig = getSecureSig(tmp, &szEncMsg); @@ -226,7 +226,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ptrA reSend((LPSTR)mir_alloc(mir_strlen(szEncMsg) + LEN_RSND)); mir_strcpy(reSend, SIG_RSND); // copy resend sig - strcat(reSend, szEncMsg); // add mess + mir_strcat(reSend, szEncMsg); // add mess pccsd->wParam |= PREF_METANODB; pccsd->lParam = (LPARAM)reSend; // reSend Message to reemit diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp index 2e6f647f8d..cf3280e56e 100644 --- a/plugins/SeenPlugin/src/history.cpp +++ b/plugins/SeenPlugin/src/history.cpp @@ -27,8 +27,8 @@ char* BuildSetting(int historyLast) static char setting[15]; static char sztemp[15]; *setting = '\0'; - strcat(setting, "History_"); - strcat(setting, _itoa(historyLast, sztemp, 10)); + mir_strcat(setting, "History_"); + mir_strcat(setting, _itoa(historyLast, sztemp, 10)); return setting; } diff --git a/plugins/Spamotron/src/bayes.cpp b/plugins/Spamotron/src/bayes.cpp index ae3692b1f6..b85a4249f0 100644 --- a/plugins/Spamotron/src/bayes.cpp +++ b/plugins/Spamotron/src/bayes.cpp @@ -30,7 +30,7 @@ int CheckBayes() else strncpy_s(bayesdb_fullpath, bayesdb_tmp, _TRUNCATE); - strcat(bayesdb_fullpath, "\\"BAYESDB_FILENAME); + mir_strcat(bayesdb_fullpath, "\\"BAYESDB_FILENAME); if (_access(bayesdb_fullpath,0) == 0) return 1; @@ -52,13 +52,13 @@ int OpenBayes() if (tmp[mir_strlen(tmp)-1] == '\\') tmp[mir_strlen(tmp)-1] = 0; mir_strcpy(bayesdb_fullpath, tmp); - strcat(bayesdb_fullpath, "\\"BAYESDB_PATH); + mir_strcat(bayesdb_fullpath, "\\"BAYESDB_PATH); mir_free(tmp); } CallService(MS_UTILS_CREATEDIRTREE, 0, (LPARAM)bayesdb_fullpath); - strcat(bayesdb_fullpath, "\\"BAYESDB_FILENAME); + mir_strcat(bayesdb_fullpath, "\\"BAYESDB_FILENAME); bayesdb_fullpath_utf8 = mir_utf8encode(bayesdb_fullpath); if (sqlite3_open(bayesdb_fullpath_utf8, &bayesdb) == SQLITE_OK) diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index d7ca019dc7..fd8d00c01a 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -136,8 +136,8 @@ INT_PTR CALLBACK DlgProcOptionsMain(HWND optDlg, UINT msg, WPARAM wParam, LPARAM lvi.pszText = mir_a2u(pd[i]->szName); ListView_InsertItem(hProtocolsList, &lvi); memset(protoOption, 0, sizeof(protoOption)); - strcat(protoOption, "proto_"); - strcat(protoOption, pd[i]->szName); + mir_strcat(protoOption, "proto_"); + mir_strcat(protoOption, pd[i]->szName); ListView_SetCheckState(hProtocolsList, j++, _getOptB(protoOption, 0)); } @@ -200,8 +200,8 @@ INT_PTR CALLBACK DlgProcOptionsMain(HWND optDlg, UINT msg, WPARAM wParam, LPARAM ListView_GetItemText(hProtocolsList, i, 0, buf, SIZEOF(buf)); //wcstombs(protoName, buf, SIZEOF(buf)); memset(protoOption, 0, sizeof(protoOption)); - strcat(protoOption, "proto_"); - strcat(protoOption, mir_u2a(buf)); + mir_strcat(protoOption, "proto_"); + mir_strcat(protoOption, mir_u2a(buf)); _setOptB(protoOption, ListView_GetCheckState(hProtocolsList, i)); } return TRUE; diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp index a9701c81a2..87172f6092 100644 --- a/plugins/Spamotron/src/spamotron.cpp +++ b/plugins/Spamotron/src/spamotron.cpp @@ -85,8 +85,8 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) /*** Check for conditional and unconditional approval ***/ // Pass-through if protocol is not enabled - strcat(protoOption, "proto_"); - strcat(protoOption, dbei->szModule); + mir_strcat(protoOption, "proto_"); + mir_strcat(protoOption, dbei->szModule); if (_getOptB(protoOption, 0) == 0) // Protocol is not handled by Spam-o-tron return 0; @@ -503,7 +503,7 @@ void RemoveNotOnListSettings() mir_strcpy(protoName, "proto_"); while (hContact != NULL) { if (db_get_s(hContact, "Protocol", "p", &dbv) == 0) { - strcat(protoName, dbv.pszVal); + mir_strcat(protoName, dbv.pszVal); if (_getOptB(protoName, 0) != 0) { if (db_get_b(hContact, "CList", "Delete", 0) == 1) { db_unset(hContact, "CList", "NotOnList"); diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp index 936f398a43..06de929df4 100644 --- a/plugins/StatusPlugins/StartupStatus/options.cpp +++ b/plugins/StatusPlugins/StartupStatus/options.cpp @@ -119,7 +119,7 @@ static char* GetCMDL(TSettingsList& protoSettings) char* args = GetCMDLArguments(protoSettings); if ( args ) { cmdl = ( char* )realloc(cmdl, mir_strlen(cmdl) + mir_strlen(args) + 1); - strcat(cmdl, args); + mir_strcat(cmdl, args); free(args); } return cmdl; diff --git a/plugins/TopToolBar/src/common.h b/plugins/TopToolBar/src/common.h index b046816ad9..5819403c81 100644 --- a/plugins/TopToolBar/src/common.h +++ b/plugins/TopToolBar/src/common.h @@ -119,7 +119,7 @@ char *AS(char *str, const char *setting, char *addstr) { if (str != NULL) { mir_strcpy(str, setting); - strcat(str, addstr); + mir_strcat(str, addstr); } return str; } diff --git a/plugins/Watrack_MPD/src/main.cpp b/plugins/Watrack_MPD/src/main.cpp index 4324eb91d9..567d1c00d7 100755 --- a/plugins/Watrack_MPD/src/main.cpp +++ b/plugins/Watrack_MPD/src/main.cpp @@ -87,8 +87,8 @@ int Parser() if(mir_strlen(tmp2) > 2) { mir_strcpy(tmp, "password "); - strcat(tmp, tmp2); - strcat(tmp, "\n"); + mir_strcat(tmp, tmp2); + mir_strcat(tmp, "\n"); Netlib_Send(ghConnection, tmp, (int)mir_strlen(tmp), 0); recvResult = CallService(MS_NETLIB_GETMOREPACKETS,(WPARAM)ghPacketReciever, (LPARAM)&nlpr); if(recvResult == SOCKET_ERROR) diff --git a/plugins/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp index 001e0a1396..0edbaef6a8 100644 --- a/plugins/Weather/src/weather_conv.cpp +++ b/plugins/Weather/src/weather_conv.cpp @@ -549,7 +549,7 @@ TCHAR* GetDisplay(WEATHERINFO *w, const TCHAR *dis, TCHAR* str) // read the entire variable name while (dis[i] != ']' && i < mir_tstrlen(dis)) { mir_snprintf(temp, SIZEOF(temp), "%c", dis[i++]); - strcat(name, temp); + mir_strcat(name, temp); } // access the database to get its value if ( !db_get_ts(w->hContact, WEATHERCONDITION, name, &dbv)) { diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index 98e356aa69..8cd85bd533 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -51,35 +51,35 @@ void InitServices() char SvcFunc[100]; mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_GETCAPS); + mir_strcat(SvcFunc, PS_GETCAPS); CreateServiceFunction(SvcFunc, GetCaps); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_GETNAME); + mir_strcat(SvcFunc, PS_GETNAME); CreateServiceFunction(SvcFunc, GetName); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_LOADICON); + mir_strcat(SvcFunc, PS_LOADICON); CreateServiceFunction(SvcFunc, BPLoadIcon); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_SETSTATUS); + mir_strcat(SvcFunc, PS_SETSTATUS); CreateServiceFunction(SvcFunc, SetStatus); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_GETSTATUS); + mir_strcat(SvcFunc, PS_GETSTATUS); CreateServiceFunction(SvcFunc, GetStatus); // mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_BASICSEARCH); + mir_strcat(SvcFunc, PS_BASICSEARCH); CreateServiceFunction(SvcFunc, BasicSearch); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PS_ADDTOLIST); + mir_strcat(SvcFunc, PS_ADDTOLIST); CreateServiceFunction(SvcFunc, AddToList); mir_strcpy(SvcFunc, MODULENAME); - strcat(SvcFunc, PSS_GETINFO); + mir_strcat(SvcFunc, PSS_GETINFO); CreateServiceFunction(SvcFunc, GetInfo); } diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 30be9de484..42bf4be905 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -51,7 +51,7 @@ int Log(char *format, ...) va_end(vararg); if (str[mir_strlen(str) - 1] != '\n') - strcat(str, "\n"); + mir_strcat(str, "\n"); fputs(str, fout); fclose(fout); #endif diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp index 67a80646e6..f13cc4ee2d 100644 --- a/plugins/YahooGroups/src/utils.cpp +++ b/plugins/YahooGroups/src/utils.cpp @@ -57,7 +57,7 @@ int Log(char *format, ...) va_end(vararg); if (str[mir_strlen(str) - 1] != '\n') { - strcat(str, "\n"); + mir_strcat(str, "\n"); } fputs(str, fout); fclose(fout); -- cgit v1.2.3