diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:25:49 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:25:49 +0000 |
| commit | f2de79cb2eb8247548650ee80d75be109ac66ee7 (patch) | |
| tree | 5f6ae43436ad92857bc3361556e581dea0a28270 | |
| parent | 83810fbdf96dc0a842bf149cfa40749e95b0fe63 (diff) | |
replace strcat to mir_strcat
git-svn-id: http://svn.miranda-ng.org/main/trunk@13777 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
83 files changed, 306 insertions, 306 deletions
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, "</tooltip>\r\n")) {
- strcat(tooltip, line);
+ mir_strcat(tooltip, line);
fgets(line, 2000, file);
}
// the line that has the </tooltip>
@@ -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);
diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index 378d20f78e..f949bd7479 100644 --- a/protocols/Gadu-Gadu/src/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp @@ -113,18 +113,18 @@ char *oauth_generate_signature(LIST<OAUTHPARAMETER> ¶ms, const char *httpmet res = (char *)mir_alloc(size);
mir_strcpy(res, httpmethod);
- strcat(res, "&");
- strcat(res, urlenc);
+ mir_strcat(res, "&");
+ mir_strcat(res, urlenc);
mir_free(urlenc);
- strcat(res, "&");
+ mir_strcat(res, "&");
for (i = 0; i < params.getCount(); i++) {
p = params[i];
if (!mir_strcmp(p->name, "oauth_signature")) continue;
- if (i > 0) strcat(res, "%26");
- strcat(res, p->name);
- strcat(res, "%3D");
- strcat(res, p->value);
+ if (i > 0) mir_strcat(res, "%26");
+ mir_strcat(res, p->name);
+ mir_strcat(res, "%3D");
+ mir_strcat(res, p->value);
}
return res;
@@ -196,8 +196,8 @@ int oauth_sign_request(LIST<OAUTHPARAMETER> ¶ms, const char *httpmethod, con ptrA tsenc( oauth_uri_escape(token_secret));
ptrA key((char *)mir_alloc(mir_strlen(csenc) + mir_strlen(tsenc) + 2));
mir_strcpy(key, csenc);
- strcat(key, "&");
- strcat(key, tsenc);
+ mir_strcat(key, "&");
+ mir_strcat(key, tsenc);
BYTE digest[MIR_SHA1_HASH_SIZE];
mir_hmac_sha1(digest, (BYTE*)(char*)key, mir_strlen(key), (BYTE*)(char*)text, mir_strlen(text));
@@ -209,8 +209,8 @@ int oauth_sign_request(LIST<OAUTHPARAMETER> ¶ms, const char *httpmethod, con sign = (char *)mir_alloc(mir_strlen(csenc) + mir_strlen(tsenc) + 2);
mir_strcpy(sign, csenc);
- strcat(sign, "&");
- strcat(sign, tsenc);
+ mir_strcat(sign, "&");
+ mir_strcat(sign, tsenc);
}
oauth_setparam(params, "oauth_signature", sign);
@@ -277,11 +277,11 @@ char *oauth_auth_header(const char *httpmethod, const char *url, OAUTHSIGNMETHOD for (i = 0; i < oauth_parameters.getCount(); i++) {
OAUTHPARAMETER *p = oauth_parameters[i];
- if (i > 0) strcat(res, ",");
- strcat(res, p->name);
- strcat(res, "=\"");
- strcat(res, p->value);
- strcat(res, "\"");
+ if (i > 0) mir_strcat(res, ",");
+ mir_strcat(res, p->name);
+ mir_strcat(res, "=\"");
+ mir_strcat(res, p->value);
+ mir_strcat(res, "\"");
}
oauth_freeparams(oauth_parameters);
diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp index e97dca0e4f..d4c8379d75 100644 --- a/protocols/ICQCorp/src/services.cpp +++ b/protocols/ICQCorp/src/services.cpp @@ -527,7 +527,7 @@ static int icqModulesLoaded(WPARAM wParam, LPARAM lParam) char *CreateServiceName(char *serviceName, char *functionName)
{
mir_strcpy(serviceName, protoName);
- strcat(serviceName, functionName);
+ mir_strcat(serviceName, functionName);
return serviceName;
}
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp index d330cc0963..9b333a5597 100644 --- a/protocols/IRCG/src/irclib.cpp +++ b/protocols/IRCG/src/irclib.cpp @@ -178,7 +178,7 @@ void CIrcProto::SendIrcMessage(const TCHAR* msg, bool bNotify, int codepage) rtrim(str); int cbLen = (int)mir_strlen(str); str = (char*)mir_realloc(str, cbLen + 3); - strcat(str, "\r\n"); + mir_strcat(str, "\r\n"); NLSend((const BYTE*)str, cbLen + 2); mir_free(str); diff --git a/protocols/IcqOscarJ/src/capabilities.cpp b/protocols/IcqOscarJ/src/capabilities.cpp index 06abb24da0..b6af33a09c 100644 --- a/protocols/IcqOscarJ/src/capabilities.cpp +++ b/protocols/IcqOscarJ/src/capabilities.cpp @@ -88,8 +88,8 @@ void NetLog_CapabilityChange(CIcqProto *ppro, const char *szChange, DWORD fdwCap // Check if the current capability is present
if ((fdwCapabilities & CapabilityNames[nIndex].capID) == CapabilityNames[nIndex].capID) {
if (mir_strlen(szBuffer))
- strcat(szBuffer, ", ");
- strcat(szBuffer, CapabilityNames[nIndex].capName);
+ mir_strcat(szBuffer, ", ");
+ mir_strcat(szBuffer, CapabilityNames[nIndex].capName);
}
}
// Log the change
diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp index 948cf1d92d..2f31a8a890 100644 --- a/protocols/IcqOscarJ/src/fam_01service.cpp +++ b/protocols/IcqOscarJ/src/fam_01service.cpp @@ -526,8 +526,8 @@ char* CIcqProto::buildUinList(int subtype, size_t wMaxLen, MCONTACT *hContactRes return szList;
}
- strcat(szList, szLen);
- strcat(szList, szUID);
+ mir_strcat(szList, szLen);
+ mir_strcat(szList, szUID);
}
}
diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp index 3dc6b83c19..5ceaf78eae 100644 --- a/protocols/IcqOscarJ/src/fam_04message.cpp +++ b/protocols/IcqOscarJ/src/fam_04message.cpp @@ -309,7 +309,7 @@ void CIcqProto::handleRecvServMsgType1(BYTE *buf, size_t wLen, DWORD dwUin, char // Append the new message part
szMsg = (char*)SAFE_REALLOC(szMsg, mir_strlen(szMsg) + mir_strlen(szMsgPart) + 1);
- strcat(szMsg, szMsgPart);
+ mir_strcat(szMsg, szMsgPart);
SAFE_FREE(&szMsgPart);
}
wMsgPart++;
@@ -1605,10 +1605,10 @@ void CIcqProto::handleMessageTypes(DWORD dwUin, char *szUID, DWORD dwTimestamp, char *szDataUrl = ansi_to_utf8(pszMsgField[1]);
char *szBlob = (char *)SAFE_MALLOC(mir_strlen(szTitle) + mir_strlen(szDataDescr) + mir_strlen(szDataUrl) + 8);
mir_strcpy(szBlob, szTitle);
- strcat(szBlob, " ");
- strcat(szBlob, szDataDescr); // Description
- strcat(szBlob, "\r\n");
- strcat(szBlob, szDataUrl); // URL
+ mir_strcat(szBlob, " ");
+ mir_strcat(szBlob, szDataDescr); // Description
+ mir_strcat(szBlob, "\r\n");
+ mir_strcat(szBlob, szDataUrl); // URL
SAFE_FREE(&szTitle);
SAFE_FREE(&szDataDescr);
SAFE_FREE(&szDataUrl);
diff --git a/protocols/IcqOscarJ/src/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp index 3ccce04839..79f6e6d9e9 100644 --- a/protocols/IcqOscarJ/src/icq_clients.cpp +++ b/protocols/IcqOscarJ/src/icq_clients.cpp @@ -47,9 +47,9 @@ static void verToStr(char *szStr, int v) {
char szVer[64];
makeClientVersion(szVer, "", (v >> 24) & 0x7F, (v >> 16) & 0xFF, (v >> 8) & 0xFF, v & 0xFF);
- strcat(szStr, szVer);
+ mir_strcat(szStr, szVer);
if (v & 0x80000000)
- strcat(szStr, " alpha");
+ mir_strcat(szStr, " alpha");
}
static char* MirandaVersionToStringEx(char* szStr, int bUnicode, const char* szPlug, int v, int m)
@@ -66,16 +66,16 @@ static char* MirandaVersionToStringEx(char* szStr, int bUnicode, const char* szP else {
if (m) {
verToStr(szStr, m);
- strcat(szStr, " ");
+ mir_strcat(szStr, " ");
}
if (bUnicode)
- strcat(szStr, "Unicode ");
+ mir_strcat(szStr, "Unicode ");
- strcat(szStr, "(");
- strcat(szStr, szPlug);
- strcat(szStr, " v");
+ mir_strcat(szStr, "(");
+ mir_strcat(szStr, szPlug);
+ mir_strcat(szStr, " v");
verToStr(szStr, v);
- strcat(szStr, ")");
+ mir_strcat(szStr, ")");
}
return szStr;
@@ -90,7 +90,7 @@ char* MirandaModToString(char* szStr, capstr* capId, int bUnicode, const char* s char *szClient = MirandaVersionToStringEx(szStr, bUnicode, szModName, iver, mver);
if (scode == 0x5AFEC0DE)
- strcat(szClient, " + SecureIM");
+ mir_strcat(szClient, " + SecureIM");
return szClient;
}
@@ -227,7 +227,7 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, cliLicqVer, ver / 1000, (ver / 10) % 100, ver % 10, 0);
if (dwFT1 & 0x00800000)
- strcat(szClientBuf, "/SSL");
+ mir_strcat(szClientBuf, "/SSL");
}
else if (dwFT1 == 0xffffff8f)
szClient = "StrICQ";
@@ -273,16 +273,16 @@ const char* CIcqProto::detectUserClient( // http://darkjimm.ucoz.ru/
if (dwFT2 == 0x10000) {
mir_strcpy(szClientBuf, "D[i]Chat v.");
- strcat(szClientBuf, "0.1a");
+ mir_strcat(szClientBuf, "0.1a");
}
else {
makeClientVersion(szClientBuf, "D[i]Chat v.", (dwFT2 >> 8) & 0x0F, (dwFT2 >> 4) & 0x0F, 0, 0);
if ((dwFT2 & 0x0F) == 1)
- strcat(szClientBuf, " alpha");
+ mir_strcat(szClientBuf, " alpha");
else if ((dwFT2 & 0x0F) == 2)
- strcat(szClientBuf, " beta");
+ mir_strcat(szClientBuf, " beta");
else if ((dwFT2 & 0x0F) == 3)
- strcat(szClientBuf, " final");
+ mir_strcat(szClientBuf, " final");
}
szClient = szClientBuf;
}
@@ -310,16 +310,16 @@ const char* CIcqProto::detectUserClient( if (MatchCapability(caps, wLen, &capIcqJs7, 0x4)) {
// detect mod
- strcat(szClientBuf, " (s7 & sss)");
+ mir_strcat(szClientBuf, " (s7 & sss)");
if (MatchCapability(caps, wLen, &capIcqJs7, 0xE))
- strcat(szClientBuf, " + SecureIM");
+ mir_strcat(szClientBuf, " + SecureIM");
}
else if ((dwFT1 & 0x7FFFFFFF) == 0x7FFFFFFF) {
if (MatchCapability(caps, wLen, &capMimMobile))
- strcat(szClientBuf, " (Mobile)");
+ mir_strcat(szClientBuf, " (Mobile)");
if (dwFT3 == 0x5AFEC0DE)
- strcat(szClientBuf, " + SecureIM");
+ mir_strcat(szClientBuf, " + SecureIM");
}
*bClientId = CLID_MIRANDA;
bMirandaIM = TRUE;
@@ -332,7 +332,7 @@ const char* CIcqProto::detectUserClient( szClient = szClientBuf;
if ((dwFT1 & 0x7FFFFFFF) == 0x7FFFFFFF && dwFT3 == 0x5AFEC0DE)
- strcat(szClientBuf, " + SecureIM");
+ mir_strcat(szClientBuf, " + SecureIM");
*bClientId = CLID_MIRANDA;
bMirandaIM = TRUE;
@@ -395,9 +395,9 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, "SIM ", ver1, ver2, ver3, ver4 & 0x0F);
if (ver4 & 0x80)
- strcat(szClientBuf, "/Win32");
+ mir_strcat(szClientBuf, "/Win32");
else if (ver4 & 0x40)
- strcat(szClientBuf, "/MacOS X");
+ mir_strcat(szClientBuf, "/MacOS X");
}
else if (capId = MatchCapability(caps, wLen, &capLicq, 0xC)) {
unsigned ver1 = (*capId)[0xC];
@@ -406,7 +406,7 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, cliLicqVer, ver1, ver2, ver3, 0);
if ((*capId)[0xF])
- strcat(szClientBuf, "/SSL");
+ mir_strcat(szClientBuf, "/SSL");
}
else if (capId = MatchCapability(caps, wLen, &capKopete, 0xC)) {
unsigned ver1 = (*capId)[0xC];
@@ -424,11 +424,11 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, "climm ", ver1, ver2, ver3, ver4);
if ((ver1 & 0x80) == 0x80)
- strcat(szClientBuf, " alpha");
+ mir_strcat(szClientBuf, " alpha");
if (dwFT3 == 0x02000020)
- strcat(szClientBuf, "/Win32");
+ mir_strcat(szClientBuf, "/Win32");
else if (dwFT3 == 0x03000800)
- strcat(szClientBuf, "/MacOS X");
+ mir_strcat(szClientBuf, "/MacOS X");
}
else if (capId = MatchCapability(caps, wLen, &capmIcq, 0xC)) {
unsigned ver1 = (*capId)[0xC];
@@ -438,7 +438,7 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, "mICQ ", ver1, ver2, ver3, ver4);
if ((ver1 & 0x80) == 0x80)
- strcat(szClientBuf, " alpha");
+ mir_strcat(szClientBuf, " alpha");
}
// IM2 v2 provides also Aim Icon cap
else if (MatchCapability(caps, wLen, &capIm2))
@@ -474,10 +474,10 @@ const char* CIcqProto::detectUserClient( mir_strcpy(szClientBuf, "QIP Infium");
if (dwFT1) {
mir_snprintf(ver, SIZEOF(ver), " (%d)", dwFT1);
- strcat(szClientBuf, ver);
+ mir_strcat(szClientBuf, ver);
}
if (dwFT2 == 0x0B)
- strcat(szClientBuf, " Beta");
+ mir_strcat(szClientBuf, " Beta");
szClient = szClientBuf;
}
@@ -485,7 +485,7 @@ const char* CIcqProto::detectUserClient( mir_strcpy(szClientBuf, "QIP 2010");
if (dwFT1) {
mir_snprintf(ver, SIZEOF(ver), " (%d)", dwFT1);
- strcat(szClientBuf, ver);
+ mir_strcat(szClientBuf, ver);
}
szClient = szClientBuf;
@@ -494,7 +494,7 @@ const char* CIcqProto::detectUserClient( mir_strcpy(szClientBuf, "QIP 2012");
if (dwFT1) {
mir_snprintf(ver, SIZEOF(ver), " (%d)", dwFT1);
- strcat(szClientBuf, ver);
+ mir_strcat(szClientBuf, ver);
}
szClient = szClientBuf;
@@ -508,7 +508,7 @@ const char* CIcqProto::detectUserClient( mir_snprintf(szClientBuf, 64, cliQip, ver);
if (dwFT1 && dwFT2 == 0x0E) {
mir_snprintf(ver, SIZEOF(ver), " (%d%d%d%d)", dwFT1 >> 0x18, (dwFT1 >> 0x10) & 0xFF, (dwFT1 >> 0x08) & 0xFF, dwFT1 & 0xFF);
- strcat(szClientBuf, ver);
+ mir_strcat(szClientBuf, ver);
}
szClient = szClientBuf;
}
@@ -530,8 +530,8 @@ const char* CIcqProto::detectUserClient( mir_snprintf(ver, SIZEOF(ver), " %d.%d", dwFT1 >> 0x18, (dwFT1 >> 0x10) & 0xFF);
if ((dwFT1 & 0xFF) == 0x0B)
- strcat(ver, " Beta");
- strcat(szClientBuf, ver);
+ mir_strcat(ver, " Beta");
+ mir_strcat(szClientBuf, ver);
}
szClient = szClientBuf;
}
@@ -625,13 +625,13 @@ const char* CIcqProto::detectUserClient( switch ((*capId)[0x5]) {
case 'l':
- strcat(szClientBuf, "/Linux");
+ mir_strcat(szClientBuf, "/Linux");
break;
case 'w':
- strcat(szClientBuf, "/Win32");
+ mir_strcat(szClientBuf, "/Win32");
break;
case 'm':
- strcat(szClientBuf, "/MacOS X");
+ mir_strcat(szClientBuf, "/MacOS X");
break;
}
}
@@ -747,11 +747,11 @@ const char* CIcqProto::detectUserClient( else mir_strcpy(szClientBuf, "icq5");
if (MatchCapability(caps, wLen, &capRambler))
- strcat(szClientBuf, " (Rambler)");
+ mir_strcat(szClientBuf, " (Rambler)");
else if (MatchCapability(caps, wLen, &capAbv))
- strcat(szClientBuf, " (Abv)");
+ mir_strcat(szClientBuf, " (Abv)");
else if (MatchCapability(caps, wLen, &capNetvigator))
- strcat(szClientBuf, " (Netvigator)");
+ mir_strcat(szClientBuf, " (Netvigator)");
szClient = szClientBuf;
}
@@ -885,9 +885,9 @@ const char* CIcqProto::detectUserClient( szClient = makeClientVersion(szClientBuf, "SIM ", ver1, ver2, ver3, 0);
if ((*capId)[0xF] & 0x80)
- strcat(szClientBuf, "/Win32");
+ mir_strcat(szClientBuf, "/Win32");
else if ((*capId)[0xF] & 0x40)
- strcat(szClientBuf, "/MacOS X");
+ mir_strcat(szClientBuf, "/MacOS X");
}
else if (capId = MatchCapability(caps, wLen, &capKopete, 0xC)) {
unsigned ver1 = (*capId)[0xC];
@@ -951,7 +951,7 @@ const char* CIcqProto::detectUserClient( szClient = szClientBuf;
}
- strcat(szClientBuf, szPack);
+ mir_strcat(szClientBuf, szPack);
}
}
@@ -993,7 +993,7 @@ const char* CIcqProto::detectUserClient( mir_strcpy(szClientBuf, szClient);
szClient = szClientBuf;
}
- strcat(szClientBuf, szExtra);
+ mir_strcat(szClientBuf, szExtra);
}
}
diff --git a/protocols/IcqOscarJ/src/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp index 25a4e2f820..b03872e91b 100644 --- a/protocols/IcqOscarJ/src/icq_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp @@ -263,7 +263,7 @@ void NormalizeBackslash(char* path) {
size_t len = mir_strlen(path);
if (len && path[len-1] != '\\')
- strcat(path, "\\");
+ mir_strcat(path, "\\");
}
/* a file transfer looks like this:
@@ -377,10 +377,10 @@ void CIcqProto::handleFileTransferPacket(directconnect* dc, PBYTE buf, size_t wL char *szFullPath = (char*)SAFE_MALLOC(mir_strlen(dc->ft->szSavePath) + mir_strlen(dc->ft->szThisSubdir) + mir_strlen(dc->ft->szThisFile) + 3);
mir_strcpy(szFullPath, dc->ft->szSavePath);
NormalizeBackslash(szFullPath);
- strcat(szFullPath, dc->ft->szThisSubdir);
+ mir_strcat(szFullPath, dc->ft->szThisSubdir);
NormalizeBackslash(szFullPath);
// _chdir(szFullPath); // set current dir - not very useful
- strcat(szFullPath, dc->ft->szThisFile);
+ mir_strcat(szFullPath, dc->ft->szThisFile);
// we joined the full path to dest file
SAFE_FREE(&dc->ft->szThisFile);
dc->ft->szThisFile = szFullPath;
diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp index bebaa2a01f..ae86931ce7 100644 --- a/protocols/IcqOscarJ/src/icq_popups.cpp +++ b/protocols/IcqOscarJ/src/icq_popups.cpp @@ -214,35 +214,35 @@ int CIcqProto::ShowPopupMsg(MCONTACT hContact, const char *szTitle, const char * rsIcon = MAKEINTRESOURCE(IDI_INFORMATION);
ppd.colorBack = DEFAULT_LOG0_BACK_COLORS;
ppd.colorText = DEFAULT_LOG0_TEXT_COLORS;
- strcat(szPrefix, "0");
+ mir_strcat(szPrefix, "0");
break;
case LOG_WARNING:
rsIcon = MAKEINTRESOURCE(IDI_WARNING);
ppd.colorBack = DEFAULT_LOG1_BACK_COLORS;
ppd.colorText = DEFAULT_LOG1_TEXT_COLORS;
- strcat(szPrefix, "1");
+ mir_strcat(szPrefix, "1");
break;
case LOG_ERROR:
rsIcon = MAKEINTRESOURCE(IDI_ERROR);
ppd.colorBack = DEFAULT_LOG2_BACK_COLORS;
ppd.colorText = DEFAULT_LOG2_TEXT_COLORS;
- strcat(szPrefix, "2");
+ mir_strcat(szPrefix, "2");
break;
case LOG_FATAL:
rsIcon = MAKEINTRESOURCE(IDI_ERROR);
ppd.colorBack = DEFAULT_LOG3_BACK_COLORS;
ppd.colorText = DEFAULT_LOG3_TEXT_COLORS;
- strcat(szPrefix, "3");
+ mir_strcat(szPrefix, "3");
break;
case POPTYPE_SPAM:
rsIcon = MAKEINTRESOURCE(IDI_WARNING);
ppd.colorBack = DEFAULT_SPAM_BACK_COLORS;
ppd.colorText = DEFAULT_SPAM_TEXT_COLORS;
- strcat(szPrefix, "Spam");
+ mir_strcat(szPrefix, "Spam");
break;
default:
return -1;
@@ -263,15 +263,15 @@ int CIcqProto::ShowPopupMsg(MCONTACT hContact, const char *szTitle, const char * }
else {
mir_strcpy(szSetting, szPrefix);
- strcat(szSetting, "TextColor");
+ mir_strcat(szSetting, "TextColor");
ppd.colorText = getDword(szSetting, ppd.colorText);
mir_strcpy(szSetting, szPrefix);
- strcat(szSetting, "BackColor");
+ mir_strcat(szSetting, "BackColor");
ppd.colorBack = getDword(szSetting, ppd.colorBack);
}
}
mir_strcpy(szSetting, szPrefix);
- strcat(szSetting, "Timeout");
+ mir_strcat(szSetting, "Timeout");
ppd.iSeconds = getDword(szSetting, ppd.iSeconds);
char str[4096];
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 5c5852e375..93ad99c91e 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -1317,7 +1317,7 @@ int __cdecl CIcqProto::SendMsg(MCONTACT hContact, int, const char* pszSrc) mng = (char*)SAFE_REALLOC(mng, len + 28);
memmove(mng + 12, mng, len + 1);
memcpy(mng, "<HTML><BODY>", 12);
- strcat(mng, "</BODY></HTML>");
+ mir_strcat(mng, "</BODY></HTML>");
puszText = mng;
bNeedFreeU = 1;
}
diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index cfa8c1dd7f..a361615d41 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -1484,8 +1484,8 @@ char *CIcqProto::getServListGroupCListPath(WORD wGroupId) /// FIXME: properly handle ~N suffixes
szParentGroup = (char*)SAFE_REALLOC(szParentGroup, mir_strlen(szGroup) + mir_strlen(szParentGroup) + 2);
- strcat(szParentGroup, "\\");
- strcat(szParentGroup, (char*)szGroup + nGroupLevel);
+ mir_strcat(szParentGroup, "\\");
+ mir_strcat(szParentGroup, (char*)szGroup + nGroupLevel);
SAFE_FREE((void**)&szGroup);
szGroup = szParentGroup;
@@ -1552,8 +1552,8 @@ char* CIcqProto::getServListUniqueGroupName(const char *szGroupName, int bAlloce szNewGroupName = (char*)SAFE_MALLOC(mir_strlen(szUnique) + mir_strlen(szGroupNameBase) + 2);
if (szNewGroupName) {
mir_strcpy(szNewGroupName, szGroupNameBase);
- strcat(szNewGroupName, "~");
- strcat(szNewGroupName, szUnique);
+ mir_strcat(szNewGroupName, "~");
+ mir_strcat(szNewGroupName, szUnique);
}
}
}
@@ -1587,8 +1587,8 @@ int CIcqProto::servlistCreateGroup_gotParentGroup(const char *szGroup, WORD wGro szSubGroup = (char*)SAFE_MALLOC(mir_strlen(szGroup) + mir_strlen(szSubGroupName) + 2);
if (szSubGroup) {
mir_strcpy(szSubGroup, szGroup);
- strcat(szSubGroup, "\\");
- strcat(szSubGroup, szSubGroupName);
+ mir_strcat(szSubGroup, "\\");
+ mir_strcat(szSubGroup, szSubGroupName);
}
if (nResult == PENDING_RESULT_SUCCESS) // if we got an id count level
@@ -2148,7 +2148,7 @@ void CIcqProto::servlistRenameGroup(char *szGroup, WORD wGroupId, char *szNewGro for (i = 0; i < nGroupLevel; i++) { // create level prefix
szNewGroupName[i] = '>';
}
- strcat(szNewGroupName, szGroupName);
+ mir_strcat(szNewGroupName, szGroupName);
}
else // simple groups do not require any conversion
szNewGroupName = null_strdup(szNewGroup);
diff --git a/protocols/IcqOscarJ/src/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp index f9dfd0615b..b09ca643d9 100644 --- a/protocols/IcqOscarJ/src/icq_xtraz.cpp +++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp @@ -318,15 +318,15 @@ void CIcqProto::handleXtrazData(DWORD dwUin, char* szMsg, BOOL bThruDC) szWork = strstrnull(szUrl, ".html");
if (szWork) {
mir_strcpy(szWork, ".php");
- strcat(szWork, szWork + 5);
+ mir_strcat(szWork, szWork + 5);
}
while (szWork = strstrnull(szUrl, "&")) // unescape & code
mir_strcpy(szWork + 1, szWork + 5);
szWork = (char*)SAFE_MALLOC(nDataLen + MAX_PATH);
ICQTranslateUtfStatic(LPGEN("Greeting card:"), szWork, MAX_PATH);
- strcat(szWork, "\r\nhttp://www.icq.com/friendship/pages/view_page_");
- strcat(szWork, szNum);
+ mir_strcat(szWork, "\r\nhttp://www.icq.com/friendship/pages/view_page_");
+ mir_strcat(szWork, szNum);
// Create message to notify user
PROTORECVEVENT pre = { 0 };
diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp index 12edd8348b..a229dda6a3 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp @@ -873,7 +873,7 @@ HANDLE CIcqProto::oftFileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR if (ft->szThisPath) { // Append Directory name to the save path, when transfering a directory
ft->szSavePath = (char*)SAFE_REALLOC(ft->szSavePath, mir_strlen(ft->szSavePath) + mir_strlen(ft->szThisPath) + 4);
NormalizeBackslash(ft->szSavePath);
- strcat(ft->szSavePath, ft->szThisPath);
+ mir_strcat(ft->szSavePath, ft->szThisPath);
NormalizeBackslash(ft->szSavePath);
}
@@ -1755,13 +1755,13 @@ void CIcqProto::handleOFT2FramePacket(oscar_connection *oc, WORD datatype, BYTE char *szFullPath = (char*)SAFE_MALLOC(mir_strlen(ft->szSavePath) + mir_strlen(ft->szThisPath) + mir_strlen(ft->szThisFile) + 3);
mir_strcpy(szFullPath, ft->szSavePath);
NormalizeBackslash(szFullPath);
- strcat(szFullPath, ft->szThisPath);
+ mir_strcat(szFullPath, ft->szThisPath);
NormalizeBackslash(szFullPath);
// make sure the dest dir exists
if (MakeDirUtf(szFullPath))
NetLog_Direct("Failed to create destination directory!");
- strcat(szFullPath, ft->szThisFile);
+ mir_strcat(szFullPath, ft->szThisFile);
// we joined the full path to dest file
SAFE_FREE(&ft->szThisFile);
ft->szThisFile = szFullPath;
@@ -2040,7 +2040,7 @@ void CIcqProto::oft_sendPeerInit(oscar_connection *oc) char *pszThisFileName = (char*)SAFE_MALLOC(mir_strlen(ft->szThisFile) + mir_strlen(szThisContainer) + 4);
mir_strcpy(pszThisFileName, szThisContainer);
NormalizeBackslash(pszThisFileName);
- strcat(pszThisFileName, ExtractFileName(ft->szThisFile));
+ mir_strcat(pszThisFileName, ExtractFileName(ft->szThisFile));
// convert backslashes to dir markings
for (size_t i = 0; i < mir_strlen(pszThisFileName); i++)
diff --git a/protocols/IcqOscarJ/src/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp index 54b76ff356..3ea12a967b 100644 --- a/protocols/IcqOscarJ/src/stdpackets.cpp +++ b/protocols/IcqOscarJ/src/stdpackets.cpp @@ -990,9 +990,9 @@ void CIcqProto::icq_sendAwayMsgReplyServExt(DWORD dwUin, char *szUID, DWORD dwMs char *mng = MangleXml(pszMsg, mir_strlen(pszMsg));
pszMsg = (char*)SAFE_MALLOC(mir_strlen(mng) + 28);
mir_strcpy(pszMsg, "<HTML><BODY>"); /// TODO: add support for RTL & user customizable font
- strcat(pszMsg, mng);
+ mir_strcat(pszMsg, mng);
SAFE_FREE(&mng);
- strcat(pszMsg, "</BODY></HTML>");
+ mir_strcat(pszMsg, "</BODY></HTML>");
// limit msg len to max snac size - we get disconnected if exceeded /// FIXME: correct HTML cutting
size_t wMsgLen = mir_strlen(pszMsg);
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index d68dbeba91..af56e712b3 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -98,7 +98,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, MCONTACT hContac if (hContact && ppro->IsDirectConnectionOpen(hContact, DIRECTCONN_STANDARD, 1)) {
ICQTranslateUtfStatic(LPGEN(" (DC Established)"), szExtra, SIZEOF(szExtra));
- strcat(str, (char*)szExtra);
+ mir_strcat(str, (char*)szExtra);
bUtf = 1;
}
}
diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index 7696a4d673..e8282c00bd 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -573,8 +573,8 @@ static int CopyCookies(NETLIBHTTPREQUEST *nlhrReply, NETLIBHTTPHEADER *hdr) continue;
if (p=strchr(nlhrReply->headers[i].szValue, ';')) *p=0;
if (hdr) {
- if (*hdr->szValue) strcat (hdr->szValue, "; ");
- strcat (hdr->szValue, nlhrReply->headers[i].szValue);
+ if (*hdr->szValue) mir_strcat (hdr->szValue, "; ");
+ mir_strcat (hdr->szValue, nlhrReply->headers[i].szValue);
}
else nSize += (int)mir_strlen(nlhrReply->headers[i].szValue) + 2;
}
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 0169140612..f52e6a826e 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -729,7 +729,7 @@ int ThreadData::sendPacket(const char* cmd, const char* fmt, ...) }
if (strchr(str, '\r') == NULL)
- strcat(str, "\r\n");
+ mir_strcat(str, "\r\n");
int result = send(str, mir_strlen(str));
mir_free(str);
diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp index 948e466fb9..fbaa187a5c 100644 --- a/protocols/MSN/src/msn_p2p.cpp +++ b/protocols/MSN/src/msn_p2p.cpp @@ -115,13 +115,13 @@ bool CMsnProto::p2p_createListener(filetransfer* ft, directconnection *dc, MimeH NETLIBIPLIST* ihaddr = (NETLIBIPLIST*)CallService(MS_NETLIB_GETMYIP, 1, 0);
for (unsigned i = 0; i < ihaddr->cbNum; ++i) {
if (strchr(ihaddr->szIp[i], ':')) {
- if (i6++ != 0) strcat(szIpv6, " ");
- strcat(szIpv6, ihaddr->szIp[i]);
+ if (i6++ != 0) mir_strcat(szIpv6, " ");
+ mir_strcat(szIpv6, ihaddr->szIp[i]);
}
else {
- if (i4++ != 0) strcat(szIpv4, " ");
+ if (i4++ != 0) mir_strcat(szIpv4, " ");
ipInt |= (mir_strcmp(ihaddr->szIp[i], szExtIp) == 0);
- strcat(szIpv4, ihaddr->szIp[i]);
+ mir_strcat(szIpv4, ihaddr->szIp[i]);
}
}
mir_free(ihaddr);
diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index e6b0332ebb..c90fd4263a 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -150,7 +150,7 @@ void mwFileTransfer_closed(mwFileTransfer* ft, guint32 code) char fn[MAX_PATH];
if (ftcd->save_path) mir_strcpy(fn, ftcd->save_path);
else fn[0] = 0;
- strcat(fn, mwFileTransfer_getFileName(ft));
+ mir_strcat(fn, mwFileTransfer_getFileName(ft));
DeleteFileA(fn);
}
@@ -377,8 +377,8 @@ HANDLE CSametimeProto::AcceptFileTransfer(MCONTACT hContact, HANDLE hFt, char* s else
fp[0] = 0;
- if (fn) strcat(fp, fn);
- else strcat(fp, mwFileTransfer_getFileName(ft));
+ if (fn) mir_strcat(fp, fn);
+ else mir_strcat(fp, mwFileTransfer_getFileName(ft));
ftcd->hFile = CreateFileA(fp, GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_ALWAYS, 0, 0);
if (ftcd->hFile == INVALID_HANDLE_VALUE) {
diff --git a/protocols/SkypeClassic/src/filexfer.cpp b/protocols/SkypeClassic/src/filexfer.cpp index f24e7273a7..313af9a315 100644 --- a/protocols/SkypeClassic/src/filexfer.cpp +++ b/protocols/SkypeClassic/src/filexfer.cpp @@ -78,10 +78,10 @@ INT_PTR SkypeSendFile(WPARAM, LPARAM lParam) utfmsg = (char*)make_utf8_string(files[nFiles]);
iLen += mir_strlen(utfmsg) + 3;
if (pszFile = pszFile ? (char*)realloc(pszFile, iLen) : (char*)calloc(1, iLen)) {
- if (nFiles > 0) strcat(pszFile, ",");
- strcat(pszFile, "\"");
- strcat(pszFile, utfmsg);
- strcat(pszFile, "\"");
+ if (nFiles > 0) mir_strcat(pszFile, ",");
+ mir_strcat(pszFile, "\"");
+ mir_strcat(pszFile, utfmsg);
+ mir_strcat(pszFile, "\"");
}
free(utfmsg);
}
diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp index 5d867494c0..ad6bc71967 100644 --- a/protocols/SkypeClassic/src/skypeapi.cpp +++ b/protocols/SkypeClassic/src/skypeapi.cpp @@ -710,7 +710,7 @@ INT_PTR SkypeCall(WPARAM wParam, LPARAM lParam) { if (db_get_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1;
msg=(char *)malloc(mir_strlen(dbv.pszVal)+6);
mir_strcpy(msg, "CALL ");
- strcat(msg, dbv.pszVal);
+ mir_strcat(msg, dbv.pszVal);
res=SkypeSend(msg);
}
db_free(&dbv);
@@ -748,7 +748,7 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) // if (db_get(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1;
// msg=(char *)malloc(mir_strlen(dbv.pszVal)+6);
// mir_strcpy(msg, "CALL ");
- // strcat(msg, dbv.pszVal);
+ // mir_strcat(msg, dbv.pszVal);
// res=SkypeSend(msg);
return res;
}
@@ -865,7 +865,7 @@ static INT_PTR CALLBACK DialDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR if (!db_set_s(hContact, SKYPE_PROTONAME, "SkypeOutNr", number)) {
msg=(char *)malloc(mir_strlen(number)+6);
mir_strcpy(msg, "CALL ");
- strcat(msg, number);
+ mir_strcat(msg, number);
if (SkypeSend(msg) || (ptr=SkypeRcv("ERROR", 500))) {
db_unset(hContact, SKYPE_PROTONAME, "SkypeOutNr");
if (ptr) {
@@ -1173,7 +1173,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) { {
strncpy(OldAvatarFile, dbv.pszVal, sizeof(OldAvatarFile)-4);
OldAvatarFile[sizeof(OldAvatarFile)-5] = '\0';
- strcat(OldAvatarFile, "_old");
+ mir_strcat(OldAvatarFile, "_old");
DeleteFileA(OldAvatarFile);
if (!MoveFileA(dbv.pszVal, OldAvatarFile))
{
@@ -1440,7 +1440,7 @@ void TranslateMirandaRelativePathToAbsolute(LPCSTR cszPath, LPSTR szAbsolutePath if(fQuoteSpaces && strchr((LPCSTR)szAbsolutePath, ' ')){
memmove (szAbsolutePath+1, szAbsolutePath, mir_strlen(szAbsolutePath)+1);
*szAbsolutePath='"';
- strcat (szAbsolutePath, "\"");
+ mir_strcat (szAbsolutePath, "\"");
}
TRACEA(szAbsolutePath);
@@ -1458,8 +1458,8 @@ static int my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFOR iLen += (int)mir_strlen(argv[i])+1;
if (!(CommandLine = (char*)calloc(1, iLen))) return -1;
for (i=0; argv[i]; i++) {
- if (i) strcat (CommandLine, " ");
- strcat (CommandLine, argv[i]);
+ if (i) mir_strcat (CommandLine, " ");
+ mir_strcat (CommandLine, argv[i]);
}
si.cb = sizeof(si);
diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index d46f6a2b87..358a95e153 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -901,7 +901,7 @@ void DoAutoDetect(HWND dlg) return;
}
- strcat(basePath,"\\Skype\\");
+ mir_strcat(basePath,"\\Skype\\");
sprintf (fileName, "%s\\shared.xml", basePath);
if (f1 = ezxml_parse_file(fileName))
diff --git a/protocols/Tlen/src/tlen_file.cpp b/protocols/Tlen/src/tlen_file.cpp index aaa8aa8ccd..71ad60185f 100644 --- a/protocols/Tlen/src/tlen_file.cpp +++ b/protocols/Tlen/src/tlen_file.cpp @@ -82,8 +82,8 @@ static void TlenFileReceiveParse(TLEN_FILE_TRANSFER *ft) fullFileName = (char *) mir_alloc(mir_strlen(ft->szSavePath) + mir_strlen(ft->files[ft->currentFile]) + 2);
mir_strcpy(fullFileName, ft->szSavePath);
if (fullFileName[mir_strlen(fullFileName)-1] != '\\')
- strcat(fullFileName, "\\");
- strcat(fullFileName, ft->files[ft->currentFile]);
+ mir_strcat(fullFileName, "\\");
+ mir_strcat(fullFileName, ft->files[ft->currentFile]);
ft->fileId = _open(fullFileName, _O_BINARY|_O_WRONLY|_O_CREAT|_O_TRUNC, _S_IREAD|_S_IWRITE);
ft->fileReceivedBytes = 0;
ft->fileTotalSize = ft->filesSize[ft->currentFile];
diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp index 3c31a9a097..f614b0a323 100644 --- a/protocols/Tlen/src/tlen_thread.cpp +++ b/protocols/Tlen/src/tlen_thread.cpp @@ -565,9 +565,9 @@ static void TlenProcessIqGetVersion(TlenProtocol *proto, XmlNode *node) mir_strcpy(mversion, "Miranda NG ");
CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof( mversion ) - 11, ( LPARAM )mversion + 11 );
- strcat(mversion, " (Tlen v.");
- strcat(mversion, TLEN_VERSION_STRING);
- strcat(mversion, ")");
+ mir_strcat(mversion, " (Tlen v.");
+ mir_strcat(mversion, TLEN_VERSION_STRING);
+ mir_strcat(mversion, ")");
mver = TlenTextEncode( mversion );
TlenSend( proto, "<message to='%s' type='iq'><iq type='result'><query xmlns='jabber:iq:version'><name>%s</name><version>%s</version><os>%s</os></query></iq></message>", from, mver?mver:"", version?version:"", os?os:"" );
if (!item->versionRequested) {
@@ -1132,8 +1132,8 @@ static void TlenProcessP(XmlNode *node, ThreadData *info) iStr = TlenXmlGetAttrValue(iNode, "i");
temp = (char*)mir_alloc(mir_strlen(f)+mir_strlen(iStr)+2);
mir_strcpy(temp, f);
- strcat(temp, "/");
- strcat(temp, iStr);
+ mir_strcat(temp, "/");
+ mir_strcat(temp, iStr);
f = TlenTextDecode(temp);
mir_free(temp);
node = iNode;
diff --git a/protocols/Xfire/src/SHA1.cpp b/protocols/Xfire/src/SHA1.cpp index 0c1dc41a5b..49ac7ab1aa 100644 --- a/protocols/Xfire/src/SHA1.cpp +++ b/protocols/Xfire/src/SHA1.cpp @@ -230,23 +230,23 @@ void CSHA1::ReportHash(char *szReport, unsigned char uReportType) if (uReportType == REPORT_HEX)
{
mir_snprintf(szTemp, SIZEOF(szTemp), "%02X", m_digest[0]);
- strcat(szReport, szTemp);
+ mir_strcat(szReport, szTemp);
for(i = 1; i < 20; i++)
{
mir_snprintf(szTemp, SIZEOF(szTemp), " %02X", m_digest[i]);
- strcat(szReport, szTemp);
+ mir_strcat(szReport, szTemp);
}
}
else if (uReportType == REPORT_DIGIT)
{
mir_snprintf(szTemp, SIZEOF(szTemp), "%u", m_digest[0]);
- strcat(szReport, szTemp);
+ mir_strcat(szReport, szTemp);
for(i = 1; i < 20; i++)
{
mir_snprintf(szTemp, SIZEOF(szTemp), " %u", m_digest[i]);
- strcat(szReport, szTemp);
+ mir_strcat(szReport, szTemp);
}
}
else mir_strcpy(szReport, "Error: Unknown report type!");
diff --git a/protocols/Xfire/src/SHA1.h b/protocols/Xfire/src/SHA1.h index a64c8b589b..c1d720d8a5 100644 --- a/protocols/Xfire/src/SHA1.h +++ b/protocols/Xfire/src/SHA1.h @@ -27,7 +27,7 @@ #include <stdio.h> // Needed for file access
#include <memory.h> // Needed for memset and memcpy
-#include <string.h> // Needed for strcat and mir_strcpy
+#include <string.h> // Needed for mir_strcat and mir_strcpy
#include <iostream>
#include <stdlib.h>
diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 31d43319e5..87c0a4d2b9 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -430,7 +430,7 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) {
char servicefunction[100];
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "StartGame%d");
+ mir_strcat(servicefunction, "StartGame%d");
if (dbid < 0)
dbid = pos;
diff --git a/protocols/Xfire/src/clientloginpacket.cpp b/protocols/Xfire/src/clientloginpacket.cpp index 97c1478ceb..75ccf09e2d 100644 --- a/protocols/Xfire/src/clientloginpacket.cpp +++ b/protocols/Xfire/src/clientloginpacket.cpp @@ -113,7 +113,7 @@ void ClientLoginPacket::hashSha1(const char *string, unsigned char *sha){ char szTemp[16]; for(int i = 0 ; i < 20 ; i++) { mir_snprintf(szTemp, SIZEOF(szTemp), "%02x", temp[i]); - strcat(result,szTemp); + mir_strcat(result,szTemp); } memcpy(sha,result,40); sha[40] = 0x00; diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 5b23f979f2..0978600aaf 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1092,7 +1092,7 @@ extern "C" __declspec(dllexport) int Load(void) char CurProfileF[MAX_PATH] = "";
char CurProfile[MAX_PATH] = "";
CallService(MS_DB_GETPROFILEPATH, (WPARAM)MAX_PATH, (LPARAM)AvatarsFolder);
- strcat(AvatarsFolder, "\\");
+ mir_strcat(AvatarsFolder, "\\");
CallService(MS_DB_GETPROFILENAME, (WPARAM)MAX_PATH, (LPARAM)CurProfileF);
int i;
@@ -1103,15 +1103,15 @@ extern "C" __declspec(dllexport) int Load(void) }
}
memcpy(CurProfile, CurProfileF, i);
- strcat(AvatarsFolder, CurProfile);
- strcat(AvatarsFolder, "\\");
- strcat(AvatarsFolder, "XFire");
+ mir_strcat(AvatarsFolder, CurProfile);
+ mir_strcat(AvatarsFolder, "\\");
+ mir_strcat(AvatarsFolder, "XFire");
XFireWorkingFolder = FoldersRegisterCustomPath(protocolname, "Working Folder", AvatarsFolder);
if (!(XFireIconFolder = FoldersRegisterCustomPath(protocolname, "Game Icon Folder", AvatarsFolder)))
CreateDirectoryA(AvatarsFolder, NULL);
- strcat(AvatarsFolder, "\\Avatars");
+ mir_strcat(AvatarsFolder, "\\Avatars");
if (!(XFireAvatarFolder = FoldersRegisterCustomPath(protocolname, "Avatars", AvatarsFolder)))
CreateDirectoryA(AvatarsFolder, NULL);
@@ -1124,7 +1124,7 @@ extern "C" __declspec(dllexport) int Load(void) //gotoprofilemenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "GotoProfile");
+ mir_strcat(servicefunction, "GotoProfile");
CreateServiceFunction(servicefunction, GotoProfile);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1135,7 +1135,7 @@ extern "C" __declspec(dllexport) int Load(void) //gotoxfireclansitemenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "GotoXFireClanSite");
+ mir_strcat(servicefunction, "GotoXFireClanSite");
CreateServiceFunction(servicefunction, GotoXFireClanSite);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1146,7 +1146,7 @@ extern "C" __declspec(dllexport) int Load(void) //kopiermenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "GetIPPort");
+ mir_strcat(servicefunction, "GetIPPort");
CreateServiceFunction(servicefunction, GetIPPort);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1157,7 +1157,7 @@ extern "C" __declspec(dllexport) int Load(void) //kopiermenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "VoiceIPPort");
+ mir_strcat(servicefunction, "VoiceIPPort");
CreateServiceFunction(servicefunction, GetVIPPort);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1168,7 +1168,7 @@ extern "C" __declspec(dllexport) int Load(void) //joinmenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "JoinGame");
+ mir_strcat(servicefunction, "JoinGame");
CreateServiceFunction(servicefunction, JoinGame);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1179,7 +1179,7 @@ extern "C" __declspec(dllexport) int Load(void) //joinmenüpunkt
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "StartThisGame");
+ mir_strcat(servicefunction, "StartThisGame");
CreateServiceFunction(servicefunction, StartThisGame);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1190,7 +1190,7 @@ extern "C" __declspec(dllexport) int Load(void) //remove friend
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "RemoveFriend");
+ mir_strcat(servicefunction, "RemoveFriend");
CreateServiceFunction(servicefunction, RemoveFriend);
mi.pszService = servicefunction;
mi.position = 2000070000;
@@ -1201,7 +1201,7 @@ extern "C" __declspec(dllexport) int Load(void) //block user
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "BlockFriend");
+ mir_strcat(servicefunction, "BlockFriend");
CreateServiceFunction(servicefunction, BlockFriend);
mi.pszService = servicefunction;
mi.position = 2000070000;
@@ -1212,7 +1212,7 @@ extern "C" __declspec(dllexport) int Load(void) //my fire profile
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "GotoProfile2");
+ mir_strcat(servicefunction, "GotoProfile2");
CreateServiceFunction(servicefunction, GotoProfile2);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1223,7 +1223,7 @@ extern "C" __declspec(dllexport) int Load(void) //my activity protocol
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "GotoProfileAct");
+ mir_strcat(servicefunction, "GotoProfileAct");
CreateServiceFunction(servicefunction, GotoProfileAct);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1234,7 +1234,7 @@ extern "C" __declspec(dllexport) int Load(void) //rescan my games
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "ReScanMyGames");
+ mir_strcat(servicefunction, "ReScanMyGames");
CreateServiceFunction(servicefunction, ReScanMyGames);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1244,7 +1244,7 @@ extern "C" __declspec(dllexport) int Load(void) Menu_AddMainMenuItem(&mi);
mir_strcpy(servicefunction, protocolname);
- strcat(servicefunction, "SetNick");
+ mir_strcat(servicefunction, "SetNick");
CreateServiceFunction(servicefunction, SetNickDlg);
mi.pszService = servicefunction;
mi.position = 500090000;
@@ -1876,7 +1876,7 @@ BOOL GetAvatar(char* username, XFireAvatar* av) {
char filename[512];
mir_strcpy(filename, XFireGetFoldersPath("Avatar"));
- strcat(filename, username);
+ mir_strcat(filename, username);
pos++;
//gif?!?!
@@ -1885,12 +1885,12 @@ BOOL GetAvatar(char* username, XFireAvatar* av) *(pos + 2) == 'f')
{
av->type = PA_FORMAT_GIF;
- strcat(filename, ".gif");
+ mir_strcat(filename, ".gif");
}
else//dann kanns nur jpg sein
{
av->type = PA_FORMAT_JPEG;
- strcat(filename, ".jpg");
+ mir_strcat(filename, ".jpg");
}
//verusch das bild runterladen
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index e57aee4848..4ac8fd4cd4 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -579,7 +579,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR TranslateDialogDefault(hwndDlg); mir_strcpy(inipath, XFireGetFoldersPath("IniFile")); - strcat(inipath, "xfire_games.ini"); + mir_strcat(inipath, "xfire_games.ini"); FILE * f = fopen(inipath, "r"); if (f != NULL) @@ -595,7 +595,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } mir_strcpy(inipath, XFireGetFoldersPath("IconsFile")); - strcat(inipath, "icons.dll"); + mir_strcat(inipath, "icons.dll"); f = fopen(inipath, "r"); if (f != NULL) diff --git a/protocols/Xfire/src/processbuddyinfo.cpp b/protocols/Xfire/src/processbuddyinfo.cpp index c0fd32c751..a788f2e7ca 100644 --- a/protocols/Xfire/src/processbuddyinfo.cpp +++ b/protocols/Xfire/src/processbuddyinfo.cpp @@ -54,8 +54,8 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact, c switch (buddyinfo->avatarmode) {
case 1:
- strcat(filename, username);
- strcat(filename, ".gif");
+ mir_strcat(filename, username);
+ mir_strcat(filename, ".gif");
type = PA_FORMAT_GIF;
mir_snprintf(temp, SIZEOF(temp), "/xfire/xf/images/avatars/gallery/default/%03d.gif", buddyinfo->avatarid);
@@ -63,8 +63,8 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact, c dl = GetWWWContent("media.xfire.com", temp, filename, FALSE);
break;
case 2:
- strcat(filename, username);
- strcat(filename, ".jpg");
+ mir_strcat(filename, username);
+ mir_strcat(filename, ".jpg");
type = PA_FORMAT_JPEG;
mir_snprintf(temp, SIZEOF(temp), "/avatar/100/%s.jpg?%d", username, buddyinfo->avatarid);
@@ -73,7 +73,7 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact, c break;
case 3:
type = PA_FORMAT_GIF;
- strcat(filename, "xfire.gif");
+ mir_strcat(filename, "xfire.gif");
mir_snprintf(temp, SIZEOF(temp), "/xfire/xf/images/avatars/gallery/default/xfire.gif", buddyinfo->avatarid);
diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index 80bf55faf0..d04686ea12 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -243,7 +243,7 @@ void Scan4Games(LPVOID lparam) }
mir_strcpy(inipath, XFireGetFoldersPath("IniFile"));
- strcat(inipath, "xfire_games.ini");
+ mir_strcat(inipath, "xfire_games.ini");
//erstmal db säubern
xgamelist.clearDatabase();
@@ -329,9 +329,9 @@ void Scan4Games(LPVOID lparam) if (xfire_GetPrivateProfileString(temp, "LauncherDirAppend", "", ret2, 255, inipath))
{
if (*(path + mir_strlen(path) - 1) == '\\'&&*(ret2) == '\\')
- strcat(path, (ret2 + 1));
+ mir_strcat(path, (ret2 + 1));
else
- strcat(path, ret2);
+ mir_strcat(path, ret2);
}
if (xfire_GetPrivateProfileString(temp, "LauncherDirTruncAt", "", ret2, 255, inipath))
@@ -355,7 +355,7 @@ void Scan4Games(LPVOID lparam) }
if (*(path + mir_strlen(path) - 1) != '\\')
- strcat(path, "\\");
+ mir_strcat(path, "\\");
//dateiname auslesen
@@ -363,7 +363,7 @@ void Scan4Games(LPVOID lparam) {
char pathtemp[XFIRE_MAX_STATIC_STRING_LEN];
mir_strcpy(pathtemp, path);
- strcat(pathtemp, ret2);
+ mir_strcat(pathtemp, ret2);
if (CheckPath(pathtemp))
{
@@ -375,11 +375,11 @@ void Scan4Games(LPVOID lparam) //wenn backslash bei detectexe, dann diesen skippen (eveonline bug)
if (ret[0] == '\\')
{
- strcat(pathtemp, (char*)&ret[1]);
+ mir_strcat(pathtemp, (char*)&ret[1]);
}
else
{
- strcat(pathtemp, ret);
+ mir_strcat(pathtemp, ret);
}
if (CheckPath(pathtemp))
@@ -394,7 +394,7 @@ void Scan4Games(LPVOID lparam) else if (xfire_GetPrivateProfileString(temp, "LauncherExe", "", ret2, 255, inipath))
{
cutforlaunch = path + mir_strlen(path);
- strcat(path, ret2);
+ mir_strcat(path, ret2);
}
}
else
@@ -405,7 +405,7 @@ void Scan4Games(LPVOID lparam) else if (xfire_GetPrivateProfileString(temp, "DetectExe[0]", "", ret2, 255, inipath))
{
cutforlaunch = path + mir_strlen(path);
- strcat(path, ret2);
+ mir_strcat(path, ret2);
multiexe = TRUE;
if (!CheckPath(path, path_r))
{
@@ -419,11 +419,11 @@ void Scan4Games(LPVOID lparam) //wenn backslash bei detectexe, dann diesen skippen (eveonline bug)
if (ret2[0] == '\\')
{
- strcat(path, (char*)&ret2[1]);
+ mir_strcat(path, (char*)&ret2[1]);
}
else
{
- strcat(path, ret2);
+ mir_strcat(path, ret2);
}
if (!CheckPath(path, path_r))
@@ -434,7 +434,7 @@ void Scan4Games(LPVOID lparam) else if (xfire_GetPrivateProfileString(temp, "LauncherExe", "", ret2, 255, inipath))
{
cutforlaunch = path + mir_strlen(path);
- strcat(path, ret2);
+ mir_strcat(path, ret2);
}
@@ -476,7 +476,7 @@ void Scan4Games(LPVOID lparam) pos++;
*pos = 0;
}
- strcat(path, ret2);
+ mir_strcat(path, ret2);
if (!CheckPath(path))
{
*(path) = 0;
@@ -510,7 +510,7 @@ void Scan4Games(LPVOID lparam) //letzten backslash entfernen
if (launchpath[mir_strlen(launchpath) - 1] == '\\') launchpath[mir_strlen(launchpath) - 1] = 0;
- strcat(path, ret2);
+ mir_strcat(path, ret2);
newgame->setString(path, &newgame->launchparams);
newgame->appendString(" ", &newgame->launchparams);
@@ -566,10 +566,10 @@ void Scan4Games(LPVOID lparam) newgame->setNameandIcon();
- strcat(gamelist, gamename);
- strcat(gamelist, ", ");
+ mir_strcat(gamelist, gamename);
+ mir_strcat(gamelist, ", ");
if (foundgames % 2 == 1)
- strcat(gamelist, "\r\n");
+ mir_strcat(gamelist, "\r\n");
xgamelist.Addgame(newgame);
@@ -589,8 +589,8 @@ void Scan4Games(LPVOID lparam) {
if (xfire_GetPrivateProfileString(temp, "LauncherExe", "", ret, 255, inipath))
{
- strcat(ret2, "\\");
- strcat(ret2, ret);
+ mir_strcat(ret2, "\\");
+ mir_strcat(ret2, ret);
}
str_replace(ret2, "%WINDIR%", getenv("WINDIR"));
@@ -668,10 +668,10 @@ void Scan4Games(LPVOID lparam) newgame->setNameandIcon();
- strcat(gamelist, gamename);
- strcat(gamelist, ", ");
+ mir_strcat(gamelist, gamename);
+ mir_strcat(gamelist, ", ");
if (foundgames % 2 == 1)
- strcat(gamelist, "\r\n");
+ mir_strcat(gamelist, "\r\n");
xgamelist.Addgame(newgame);
diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 3b1427d3af..05658e1ac8 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -70,8 +70,8 @@ BOOL str_replace(char*src, char*find, char*rep) mir_strcpy(temp, src); *(temp + pos) = 0; - strcat(temp, rep); - strcat(temp, (src + pos + mir_strlen(find))); + mir_strcat(temp, rep); + mir_strcat(temp, (src + pos + mir_strlen(find))); mir_strcpy(src, temp); delete[] temp; @@ -995,8 +995,8 @@ BOOL GetWWWContent2(char*address, char*filename, BOOL dontoverwrite, char**tobuf //eigener www downloader, da winet exceptions erzeugt BOOL GetWWWContent(char*host, char* request, char*filename, BOOL dontoverwrite) { char add[1024] = "http://"; - strcat(add, host); - strcat(add, request); + mir_strcat(add, host); + mir_strcat(add, request); return GetWWWContent2(add, filename, dontoverwrite); } diff --git a/protocols/Xfire/src/variables.cpp b/protocols/Xfire/src/variables.cpp index 1cf26c35be..70f167e933 100644 --- a/protocols/Xfire/src/variables.cpp +++ b/protocols/Xfire/src/variables.cpp @@ -174,7 +174,7 @@ char* XFireGetFoldersPath(char * pathtype) if (!mir_strcmp(pathtype, "IconsFile")){
FoldersGetCustomPath(XFireIconFolder, path, 1024, "");
}
- strcat(path, "\\");
+ mir_strcat(path, "\\");
return path;
}
else {
@@ -183,7 +183,7 @@ char* XFireGetFoldersPath(char * pathtype) char CurProfileF[MAX_PATH] = "";
char CurProfile[MAX_PATH] = "";
CallService(MS_DB_GETPROFILEPATH, (WPARAM)MAX_PATH, (LPARAM)BaseFolder);
- strcat(BaseFolder, "\\");
+ mir_strcat(BaseFolder, "\\");
CallService(MS_DB_GETPROFILENAME, (WPARAM)MAX_PATH, (LPARAM)CurProfileF);
int i;
for (i = MAX_PATH - 1; i > 5; i--){
@@ -193,16 +193,16 @@ char* XFireGetFoldersPath(char * pathtype) }
}
memcpy(CurProfile, CurProfileF, i);
- strcat(BaseFolder, CurProfile);
- strcat(BaseFolder, "\\");
- strcat(BaseFolder, "XFire");
- strcat(BaseFolder, "\\");
+ mir_strcat(BaseFolder, CurProfile);
+ mir_strcat(BaseFolder, "\\");
+ mir_strcat(BaseFolder, "XFire");
+ mir_strcat(BaseFolder, "\\");
/*******BASE********/
if (!mir_strcmp(pathtype, "Avatar")){
- strcat(BaseFolder, "Avatars");
- strcat(BaseFolder, "\\");
+ mir_strcat(BaseFolder, "Avatars");
+ mir_strcat(BaseFolder, "\\");
}
- strcat(path, BaseFolder);
+ mir_strcat(path, BaseFolder);
}
return path;
}
diff --git a/protocols/Yahoo/src/libyahoo2/yahoo_util.cpp b/protocols/Yahoo/src/libyahoo2/yahoo_util.cpp index cd76a77ba7..659cb4e6a9 100644 --- a/protocols/Yahoo/src/libyahoo2/yahoo_util.cpp +++ b/protocols/Yahoo/src/libyahoo2/yahoo_util.cpp @@ -50,7 +50,7 @@ char * y_string_append(char * string, char * append) FREE(string);
}
- strcat(new_string, append);
+ mir_strcat(new_string, append);
return new_string;
}
diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index 0d3adeabbf..86062285f7 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -194,7 +194,7 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) size_t len = mir_strlen(dbv.pszVal) + mir_strlen(dbv2.pszVal) + 2;
char* buf = (char*)mir_alloc(len);
if (buf != NULL)
- strcat(strcat(mir_strcpy(buf, dbv.pszVal), " "), dbv2.pszVal);
+ mir_strcat(mir_strcat(mir_strcpy(buf, dbv.pszVal), " "), dbv2.pszVal);
ci->pszVal = (TCHAR*)buf;
}
db_free(&dbv);
@@ -319,7 +319,7 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) size_t len = mir_strlen(dbv.pszVal) + mir_strlen(dbv2.pszVal) + 2;
char* buf = (char*)mir_alloc(len);
if (buf != NULL)
- strcat(strcat(mir_strcpy(buf, dbv.pszVal), " "), dbv2.pszVal);
+ mir_strcat(mir_strcat(mir_strcpy(buf, dbv.pszVal), " "), dbv2.pszVal);
ci->pszVal = (TCHAR*)buf;
}
diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index e673ae8561..2d3db45941 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -301,7 +301,7 @@ static INT_PTR NetlibLog(WPARAM wParam, LPARAM lParam) switch (logOptions.timeFormat) {
case TIMEFORMAT_HHMMSS:
GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, NULL, NULL, szTime, SIZEOF(szTime));
- strcat(szTime, " ");
+ mir_strcat(szTime, " ");
break;
case TIMEFORMAT_MILLISECONDS:
|