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

Replace Platform::GetAbsolutePath() with fs:: equivalent

Browse Source
This commit is contained in:
Gymnasiast
2022-01-26 14:58:35 +01:00
parent d7dcffbee8
commit f7adac3de2
4 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,8 @@ namespace Path
std::string GetAbsolute(std::string_view relative)
{
utf8 absolute[MAX_PATH];
return Platform::GetAbsolutePath(absolute, sizeof(absolute), std::string(relative).c_str());
std::error_code ec;
return fs::absolute(u8path(relative), ec).u8string();
}
bool Equals(std::string_view a, std::string_view b)

13
src/openrct2/platform/Platform.Posix.cpp
View File

@@ -203,19 +203,6 @@ namespace Platform
return c == '/';
}
utf8* GetAbsolutePath(utf8* buffer, size_t bufferSize, const utf8* relativePath)
{
utf8* absolutePath = realpath(relativePath, nullptr);
if (absolutePath == nullptr)
{
return String::Set(buffer, bufferSize, relativePath);
}
String::Set(buffer, bufferSize, absolutePath);
Memory::Free(absolutePath);
return buffer;
}
std::string ResolveCasing(std::string_view path, bool fileExists)
{
std::string result;

16
src/openrct2/platform/Platform.Win32.cpp
View File

@@ -585,22 +585,6 @@ namespace Platform
return c == '\\' || c == '/';
}
utf8* GetAbsolutePath(utf8* buffer, size_t bufferSize, const utf8* relativePath)
{
auto relativePathW = String::ToWideChar(relativePath);
wchar_t absolutePathW[MAX_PATH];
DWORD length = GetFullPathNameW(
relativePathW.c_str(), static_cast<DWORD>(std::size(absolutePathW)), absolutePathW, nullptr);
if (length == 0)
{
return String::Set(buffer, bufferSize, relativePath);
}
auto absolutePath = String::ToUtf8(absolutePathW);
String::Set(buffer, bufferSize, absolutePath.c_str());
return buffer;
}
std::string ResolveCasing(std::string_view path, bool fileExists)
{
std::string result;

1
src/openrct2/platform/Platform2.h
View File

@@ -36,7 +36,6 @@ namespace Platform
std::string GetCurrentExecutableDirectory();
bool ShouldIgnoreCase();
bool IsPathSeparator(char c);
utf8* GetAbsolutePath(utf8* buffer, size_t bufferSize, const utf8* relativePath);
uint64_t GetLastModified(std::string_view path);
uint64_t GetFileSize(std::string_view path);
std::string ResolveCasing(std::string_view path, bool fileExists);