1 files changed, 20 insertions, 60 deletions
diff --git a/src/modules/chat/tools.cpp b/src/modules/chat/tools.cpp
index 284753c0b4..40e1dd3cc5 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/modules/chat/tools.cpp
@@ -417,81 +417,41 @@ const TCHAR* my_strstri(const TCHAR* s1, const TCHAR* s2)
 	return NULL;
 }
 
+static TCHAR szTrimString[] = _T(":,.!?;\'>)");
+
 BOOL IsHighlighted(SESSION_INFO *si, GCEVENT *gce)
 {
 	if (!g_Settings->bHighlightEnabled || !g_Settings->pszHighlightWords || !gce || !si || !si->pMe)
 		return FALSE;
 
-	TCHAR *p1 = g_Settings->pszHighlightWords;
-	TCHAR *p2 = NULL;
-	const TCHAR* p3 = gce->ptszText;
-	if (p3 == NULL)
+	if (gce->ptszText == NULL)
 		return FALSE;
 
-	static TCHAR szWord1[1000];
-	static TCHAR szWord2[1000];
-	static TCHAR szTrimString[] = _T(":,.!?;\'>)");
+	TCHAR *buf = RemoveFormatting(NEWTSTR_ALLOCA(gce->ptszText));
 
-	// compare word for word
-	while (*p1 != '\0') {
-		// find the next/first word in the highlight word string
-		// skip 'spaces' be4 the word
-		while (*p1 == ' ' && *p1 != '\0')
-			p1 += 1;
-
-		//find the end of the word
-		p2 = _tcschr(p1, ' ');
-		if (!p2)
-			p2 = _tcschr(p1, '\0');
-		if (p1 == p2)
-			return FALSE;
-
-		// copy the word into szWord1
-		lstrcpyn(szWord1, p1, p2 - p1 > 998 ? 999 : p2 - p1 + 1);
-		p1 = p2;
+	int iStart = 0;
+	CMString tszHighlightWords(g_Settings->pszHighlightWords);
+
+	while (true) {
+		CMString tszToken = tszHighlightWords.Tokenize(_T("\t "), iStart);
+		if (iStart == -1)
+			break;
 
 		// replace %m with the users nickname
-		p2 = _tcschr(szWord1, '%');
-		if (p2 && p2[1] == 'm') {
-			TCHAR szTemp[50];
+		if (tszToken == _T("%m"))
+			tszToken = si->pMe->pszNick;
 
-			p2[1] = 's';
-			lstrcpyn(szTemp, szWord1, 999);
-			mir_sntprintf(szWord1, SIZEOF(szWord1), szTemp, si->pMe->pszNick);
-		}
+		if (tszToken.Find('*') == -1)
+			tszToken = '*' + tszToken + '*';
 
 		// time to get the next/first word in the incoming text string
-		while (*p3 != '\0') {
-			// skip 'spaces' be4 the word
-			while (*p3 == ' ' && *p3 != '\0')
-				p3 += 1;
-
-			//find the end of the word
-			p2 = (TCHAR *)_tcschr(p3, ' ');
-			if (!p2)
-				p2 = (TCHAR *)_tcschr(p3, '\0');
+		for (const TCHAR *p = buf; *p != '\0'; p += _tcscspn(p, _T(" "))) {
+			p += _tcsspn(p, _T(" "));
 
-
-			if (p3 != p2) {
-				// eliminate ending character if needed
-				if (p2 - p3 > 1 && _tcschr(szTrimString, p2[-1]))
-					p2 -= 1;
-
-				// copy the word into szWord2 and remove formatting
-				lstrcpyn(szWord2, p3, p2 - p3 > 998 ? 999 : p2 - p3 + 1);
-
-				// reset the pointer if it was touched because of an ending character
-				if (*p2 != '\0' && *p2 != ' ')
-					p2 += 1;
-				p3 = p2;
-
-				// compare the words, using wildcards
-				if (wildcmpit(RemoveFormatting(szWord2), szWord1))
-					return TRUE;
-			}
+			// compare the words, using wildcards
+			if (wildcmpit(RemoveFormatting(p), tszToken))
+				return TRUE;
 		}
-
-		p3 = gce->ptszText;
 	}
 
 	return FALSE;