ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows version of get_current_directory

Browse Source
This commit is contained in:
Mark Naughton
2023-04-25 12:08:15 +01:00
parent 67b6a8ee89
commit 5151403aaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/path.cpp
+3 -3
View File
@@ -33,8 +33,6 @@ gb_internal String remove_directory_from_path(String const &s) {
// NOTE(Mark Naughton): getcwd as String // NOTE(Mark Naughton): getcwd as String
#if !defined(GB_SYSTEM_WINDOWS) #if !defined(GB_SYSTEM_WINDOWS)
gb_internal String get_current_directory(void) { gb_internal String get_current_directory(void) {
gbAllocator a = heap_allocator();
char cwd[256]; char cwd[256];
getcwd(cwd, 256); getcwd(cwd, 256);
@@ -48,7 +46,9 @@ gb_internal String get_current_directory(void) {
wchar_t cwd[256]; wchar_t cwd[256];
GetCurrentDirectoryW(256, cwd); GetCurrentDirectoryW(256, cwd);
return make_string_c(cwd); String16 wstr = make_string16_c(cwd);
return string16_to_string(a, wstr);
} }
#endif #endif