edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 17:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8390 from Robyt3/Base-chdir-getcwd-Cleanup

Browse source 
Minor refactoring of `fs_chdir` and `fs_getcwd` functions
This commit is contained in:
heinrich5991 2024-05-22 21:25:27 +00:00 committed by GitHub
parent 848f4a846b f04bea6b4b
commit 1e11fffb03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/base/system.cpp
View file

@ -2390,17 +2390,12 @@ int fs_is_relative_path(const char *path)
int fs_chdir(const char *path)
{
if(fs_is_dir(path))
{
#if defined(CONF_FAMILY_WINDOWS)
const std::wstring wide_path = windows_utf8_to_wide(path);
return SetCurrentDirectoryW(wide_path.c_str()) != 0 ? 0 : 1;
const std::wstring wide_path = windows_utf8_to_wide(path);
return SetCurrentDirectoryW(wide_path.c_str()) != 0 ? 0 : 1;
#else
return chdir(path) ? 1 : 0;
return chdir(path) ? 1 : 0;
#endif
}
else
return 1;
}
char *fs_getcwd(char *buffer, int buffer_size)
@ -2408,15 +2403,7 @@ char *fs_getcwd(char *buffer, int buffer_size)
#if defined(CONF_FAMILY_WINDOWS)
const DWORD size_needed = GetCurrentDirectoryW(0, nullptr);
std::wstring wide_current_dir(size_needed, L'0');
DWORD result = GetCurrentDirectoryW(size_needed, wide_current_dir.data());
if(result == 0)
{
const DWORD LastError = GetLastError();
const std::string ErrorMsg = windows_format_system_message(LastError);
dbg_msg("filesystem", "GetCurrentDirectoryW failed: %ld %s", LastError, ErrorMsg.c_str());
buffer[0] = '\0';
return nullptr;
}
dbg_assert(GetCurrentDirectoryW(size_needed, wide_current_dir.data()) == size_needed - 1, "GetCurrentDirectoryW failure");
const std::optional<std::string> current_dir = windows_wide_to_utf8(wide_current_dir.c_str());
if(!current_dir.has_value())
{