thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 08:47:17 +01:00
Code Releases Activity

Use case insensitive file naming comparison for windows.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-07-04 13:59:00 +03:00
parent 3bef7e9419
commit a15f493ef5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/Core.cpp
View File

@ -748,17 +748,29 @@ bool Core::LoadScript(const SQChar * filepath, Function & cb, LightObj & ctx, bo
// See if it wasn't already loaded // See if it wasn't already loaded
if (std::find_if(m_Scripts.cbegin(), m_Scripts.cend(), [&path](Scripts::const_reference s) { if (std::find_if(m_Scripts.cbegin(), m_Scripts.cend(), [&path](Scripts::const_reference s) {
#ifdef SQMOD_OS_WINDOWS
// Windows does not have case sensitive filenames and we can end up trying to load the same file more than once
return s.mPath.size() == path.size() && strnicmp(s.mPath.c_str(), path.c_str(), path.size()) == 0;
#else
return (s.mPath == path); return (s.mPath == path);
#endif
}) != m_Scripts.end()) }) != m_Scripts.end())
{ // NOLINT(bugprone-branch-clone) { // NOLINT(bugprone-branch-clone)
LogWrn("Script was specified before: %s", path.c_str()); LogWrn("Script was specified before: %s", path.c_str());
return false; // We didn't actually fail to load it
} }
// Also check the pending scripts container // Also check the pending scripts container
else if (std::find_if(m_PendingScripts.cbegin(), m_PendingScripts.cend(), [&path](Scripts::const_reference s) { else if (std::find_if(m_PendingScripts.cbegin(), m_PendingScripts.cend(), [&path](Scripts::const_reference s) {
#ifdef SQMOD_OS_WINDOWS
// Windows does not have case sensitive filenames and we can end up trying to load the same file more than once
return s.mPath.size() == path.size() && strnicmp(s.mPath.c_str(), path.c_str(), path.size()) == 0;
#else
return (s.mPath == path); return (s.mPath == path);
#endif
}) != m_PendingScripts.end()) }) != m_PendingScripts.end())
{ {
LogWrn("Script was specified before: %s", path.c_str()); LogWrn("Script was specified before: %s", path.c_str());
return false; // We didn't actually fail to load it
} }
// Were the scripts already executed? Then there's no need to queue them // Were the scripts already executed? Then there's no need to queue them
else if (m_Executed) else if (m_Executed)