diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 9b5e564a..657a60d8 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -302,12 +302,6 @@ Sys_Directory_CD_Sig(system_directory_cd){ return(result); } -internal -Sys_Get_4ed_Path_Sig(system_get_4ed_path){ - String str = make_string_cap(out, 0, capacity); - return(system_get_binary_path(&str)); -} - internal Sys_Show_Mouse_Cursor_Sig(system_show_mouse_cursor){ linuxvars.hide_cursor = !show; diff --git a/platform_linux/linux_4ed_fonts.cpp b/platform_linux/linux_4ed_fonts.cpp index 01a617ab..50e01c15 100644 --- a/platform_linux/linux_4ed_fonts.cpp +++ b/platform_linux/linux_4ed_fonts.cpp @@ -112,7 +112,7 @@ Sys_Font_Init_Sig(system_font_init){ u32 dir_max = KB(32); u8 *directory = push_array(scratch, u8, dir_max); String dir_str = make_string_cap(directory, 0, dir_max); - u32 dir_len = system_get_binary_path(&dir_str); + u32 dir_len = system_get_binary_path_string(&dir_str); Assert(dir_len < dir_max); set_last_folder_sc(&dir_str, "fonts", '/'); diff --git a/platform_unix/unix_4ed_functions.cpp b/platform_unix/unix_4ed_functions.cpp index 00f6b959..091d322c 100644 --- a/platform_unix/unix_4ed_functions.cpp +++ b/platform_unix/unix_4ed_functions.cpp @@ -31,6 +31,25 @@ struct Unix_Vars{ static Unix_Vars unixvars; +// +// 4ed Path +// + +internal +Sys_Get_4ed_Path_Sig(system_get_4ed_path){ + ssize_t size = readlink("/proc/self/exe", out, capacity - 1); + if (size != -1 && size < capacity - 1){ + String str = make_string(out, size); + remove_last_folder(&str); + terminate_with_null(&str); + size = str.size; + } + else{ + size = 0; + } + return(size); +} + // // Logging // @@ -63,21 +82,6 @@ Sys_File_Can_Be_Made_Sig(system_file_can_be_made){ return(result); } -internal -Sys_Get_Binary_Path_Sig(system_get_binary_path){ - ssize_t size = readlink("/proc/self/exe", out->str, out->memory_size - 1); - if(size != -1 && size < out->memory_size - 1){ - out->size = size; - remove_last_folder(out); - terminate_with_null(out); - size = out->size; - } else { - size = 0; - } - - return size; -} - // // Memory // diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp index 89c36ba6..c9574004 100644 --- a/platform_win32/win32_4ed.cpp +++ b/platform_win32/win32_4ed.cpp @@ -217,15 +217,14 @@ global Application_Memory memory_vars; internal Sys_Get_4ed_Path_Sig(system_get_4ed_path){ - i32 result_size = 0; i32 size = GetModuleFileName_utf8(0, (u8*)out, capacity); if (size < capacity - 1){ String str = make_string(out, size); remove_last_folder(&str); terminate_with_null(&str); - result_size = str.size; + size = str.size; } - return(result_size); + return(size); } //