mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity

Extract ResolveCasing to Platform

Browse Source
This commit is contained in:
Tulio Leao
2021-03-26 00:07:53 -03:00
parent c7ae064a4c
commit 62fc4c8034
4 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/openrct2/core/Path.cpp
View File

@@ -7,10 +7,7 @@
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#include <algorithm>
#ifndef _WIN32
# include <dirent.h>
#endif
#include "Path.hpp"
#include "../localisation/Language.h"
#include "../platform/Platform2.h"
@@ -19,9 +16,9 @@
#include "File.h"
#include "FileSystem.hpp"
#include "Memory.hpp"
#include "Path.hpp"
#include "String.hpp"
#include <algorithm>
#include <iterator>
namespace Path
@@ -217,42 +214,6 @@ namespace Path
std::string ResolveCasing(const std::string& path)
{
std::string result;
if (File::Exists(path))
{
// Windows is case insensitive so it will exist and that is all that matters
// for now. We can properly resolve the casing if we ever need to.
result = path;
}
#ifndef _WIN32
else
{
std::string fileName = Path::GetFileName(path);
std::string directory = Path::GetDirectory(path);
struct dirent** files;
auto count = scandir(directory.c_str(), &files, nullptr, alphasort);
if (count != -1)
{
// Find a file which matches by name (case insensitive)
for (int32_t i = 0; i < count; i++)
{
if (String::Equals(files[i]->d_name, fileName.c_str(), true))
{
result = Path::Combine(directory, std::string(files[i]->d_name));
break;
}
}
// Free memory
for (int32_t i = 0; i < count; i++)
{
free(files[i]);
}
free(files);
}
}
#endif
return result;
return Platform::ResolveCasing(path, File::Exists(path));
}
} // namespace Path