REVIEWED: TextReplace(), revert breaking change, needs to be reviewed again... -WIP-

This commit is contained in:
Ray
2025-12-31 22:50:17 +01:00
parent cac02ab063
commit 95f72b162b

View File

@ -1746,16 +1746,23 @@ char *TextReplace(const char *text, const char *search, const char *replacement)
{ {
insertPoint = (char *)strstr(text, search); insertPoint = (char *)strstr(text, search);
lastReplacePos = (int)(insertPoint - text); lastReplacePos = (int)(insertPoint - text);
temp = strncpy(temp, text, tempLen - 1) + lastReplacePos;
tempLen -= lastReplacePos; // TODO: Review logic to avoid strcpy()
temp = strncpy(temp, replacement, tempLen - 1) + replaceLen; // OK - Those lines work
tempLen -= replaceLen; temp = strncpy(temp, text, lastReplacePos) + lastReplacePos;
temp = strcpy(temp, replacement) + replaceLen;
// WRONG - But not those ones
//temp = strncpy(temp, text, tempLen - 1) + lastReplacePos;
//tempLen -= lastReplacePos;
//temp = strncpy(temp, replacement, tempLen - 1) + replaceLen;
//tempLen -= replaceLen;
text += lastReplacePos + searchLen; // Move to next "end of replace" text += lastReplacePos + searchLen; // Move to next "end of replace"
} }
// Copy remaind text part after replacement to result (pointed by moving temp) // Copy remaind text part after replacement to result (pointed by moving temp)
strncpy(temp, text, tempLen - 1); strcpy(temp, text); // OK
//strncpy(temp, text, tempLen - 1); // WRONG
} }
return result; return result;