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

Merge pull request #2275 from Platin21/fix/dir-opening-macOS

Browse Source 
Fix/dir opening mac os
This commit is contained in:
gingerBill
2022-12-22 10:49:41 +00:00
committed by GitHub
parent 81037b3091 b983ac548c
commit 84e1fb2cee
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os_darwin.odin
+17 -5
View File
@@ -342,21 +342,33 @@ get_last_error_string :: proc() -> string {
} }
open :: proc(path: string, flags: int = O_RDWR, mode: int = 0) -> (Handle, Errno) { open :: proc(path: string, flags: int = O_RDWR, mode: int = 0) -> (Handle, Errno) {
isDir := is_dir_path(path)
flags := flags
if isDir {
/*
@INFO(Platin): To make it impossible to use the wrong flag for dir's
as you can't write to a dir only read which makes it fail to open
*/
flags = O_RDONLY
}
cstr := strings.clone_to_cstring(path, context.temp_allocator) cstr := strings.clone_to_cstring(path, context.temp_allocator)
handle := _unix_open(cstr, i32(flags), u16(mode)) handle := _unix_open(cstr, i32(flags), u16(mode))
if handle == -1 { if handle == -1 {
return INVALID_HANDLE, 1 return INVALID_HANDLE, cast(Errno)get_last_error()
} }
when ODIN_OS == .Darwin && ODIN_ARCH == .arm64 { /*
if mode != 0 { @INFO(Platin): this is only done because O_CREATE for some reason fails to apply mode
should not happen if the handle is a directory
*/
if mode != 0 && !isDir {
err := fchmod(handle, cast(u16)mode) err := fchmod(handle, cast(u16)mode)
if err != 0 { if err != 0 {
_unix_close(handle) _unix_close(handle)
return INVALID_HANDLE, 1 return INVALID_HANDLE, cast(Errno)err
} }
} }
}
return handle, 0 return handle, 0
} }