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 --- protocols/IcqOscarJ/src/capabilities.cpp | 4 +- protocols/IcqOscarJ/src/fam_01service.cpp | 4 +- protocols/IcqOscarJ/src/fam_04message.cpp | 10 +-- protocols/IcqOscarJ/src/icq_clients.cpp | 86 +++++++++++++------------- protocols/IcqOscarJ/src/icq_filetransfer.cpp | 6 +- protocols/IcqOscarJ/src/icq_popups.cpp | 16 ++--- protocols/IcqOscarJ/src/icq_proto.cpp | 2 +- protocols/IcqOscarJ/src/icq_servlist.cpp | 14 ++--- protocols/IcqOscarJ/src/icq_xtraz.cpp | 6 +- protocols/IcqOscarJ/src/oscar_filetransfer.cpp | 8 +-- protocols/IcqOscarJ/src/stdpackets.cpp | 4 +- protocols/IcqOscarJ/src/userinfotab.cpp | 2 +- 12 files changed, 81 insertions(+), 81 deletions(-) (limited to 'protocols/IcqOscarJ') 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, "", 12); - strcat(mng, ""); + mir_strcat(mng, ""); 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, ""); /// TODO: add support for RTL & user customizable font - strcat(pszMsg, mng); + mir_strcat(pszMsg, mng); SAFE_FREE(&mng); - strcat(pszMsg, ""); + mir_strcat(pszMsg, ""); // 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; } } -- cgit v1.2.3