From e6e4bd703c5bb1ce715465129f65275c0a1c844b Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Thu, 2 Jun 2022 01:55:41 +0200
Subject: [PATCH] Fix string utility bugs

GetFileName returned null string if file is not within a path, now returns the input file name.
RemoveFileName returned file name if file is not within a path, now returns null string.
Added StringReplaceC (string replace with copy instead of modifying the reference object).
---
 r5dev/public/include/utility.h |  5 +++--
 r5dev/public/utility.cpp       | 29 ++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/r5dev/public/include/utility.h b/r5dev/public/include/utility.h
index 4bef33cb..46a89767 100644
--- a/r5dev/public/include/utility.h
+++ b/r5dev/public/include/utility.h
@@ -17,8 +17,8 @@ void HexDump(const char* szHeader, const char* szLogger, const void* pData, int
 string GetExtension(const string& svInput);
 string RemoveExtension(const string& svInput);
 
-string GetFileName(const string& svInput, bool bRemoveExtension = false, bool bWindows = true);
-string RemoveFileName(const string& svInput, bool bWindows = true);
+string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows = false);
+string RemoveFileName(const string& svInput, bool bWindows = false);
 
 string CreateDirectories(string svInput);
 string ConvertToWinPath(const string& svInput);
@@ -35,6 +35,7 @@ bool CompareStringAlphabetically(const string& svA, const string& svB);
 bool CompareStringLexicographically(const string& svA, const string& svB);
 
 bool StringReplace(string& svInput, const string& svFrom, const string& svTo);
+string StringReplaceC(const string& svInput, const string& svFrom, const string& svTo);
 string StringEscape(const string& svInput);
 string StringUnescape(const string& svInput);
 
diff --git a/r5dev/public/utility.cpp b/r5dev/public/utility.cpp
index 7212d4f4..0f2c0eb8 100644
--- a/r5dev/public/utility.cpp
+++ b/r5dev/public/utility.cpp
@@ -277,7 +277,14 @@ string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows)
         }
         return svInput.substr(nPos + 1);
     }
-    return "";
+    else // File name is not within path.
+    {
+        if (bRemoveExtension)
+        {
+            return RemoveExtension(svInput);
+        }
+    }
+    return svInput;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -295,7 +302,7 @@ string RemoveFileName(const string& svInput, bool bWindows)
     }
     if (nPos == string::npos)
     {
-        return svInput;
+        return "";
     }
     return svInput.substr(0, nPos);
 }
@@ -473,7 +480,7 @@ bool CompareStringLexicographically(const string& svA, const string& svB)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// For replacing parts of a given string.
+// For replacing parts of a given string by reference.
 bool StringReplace(string& svInput, const string& svFrom, const string& svTo)
 {
     string::size_type nPos = svInput.find(svFrom);
@@ -486,6 +493,22 @@ bool StringReplace(string& svInput, const string& svFrom, const string& svTo)
     return true;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// For replacing parts of a given string by value.
+string StringReplaceC(const string& svInput, const string& svFrom, const string& svTo)
+{
+    string results = svInput;
+    string::size_type nPos = results.find(svFrom);
+
+    if (nPos == string::npos)
+    {
+        return results;
+    }
+
+    results.replace(nPos, svFrom.length(), svTo);
+    return results;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // For escaping special characters in a string.
 string StringEscape(const string& svInput)