mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-30 18:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

os2: fixes after rebasing

Browse Source
This commit is contained in:
Laytan Laats
2024-08-02 21:42:53 +02:00
parent e05fddc001
commit ea5783c2ac
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/os/os2/file_posix.odin
View File

@@ -26,9 +26,9 @@ File_Impl :: struct {
@(init)
init_std_files :: proc() {
// NOTE: is this (paths) also the case on non darwin?
stdin = _new_file(posix.STDIN_FILENO, "/dev/stdin")
stdout = _new_file(posix.STDOUT_FILENO, "/dev/stdout")
stderr = _new_file(posix.STDERR_FILENO, "/dev/stdout")
stdin = new_file(posix.STDIN_FILENO, "/dev/stdin")
stdout = new_file(posix.STDOUT_FILENO, "/dev/stdout")
stderr = new_file(posix.STDERR_FILENO, "/dev/stdout")
}
_open :: proc(name: string, flags: File_Flags, perm: int) -> (f: ^File, err: Error) {
@@ -63,27 +63,34 @@ _open :: proc(name: string, flags: File_Flags, perm: int) -> (f: ^File, err: Err
return
}
return _new_file(uintptr(fd), name), nil
return _new_file(uintptr(fd), name)
}
_new_file :: proc(handle: uintptr, name: string) -> ^File {
if name == "" || handle == ~uintptr(0) {
return nil
_new_file :: proc(handle: uintptr, name: string) -> (f: ^File, err: Error) {
if name == "" {
err = .Invalid_Path
return
} else if handle == ~uintptr(0) {
err = .Invalid_File
return
}
TEMP_ALLOCATOR_GUARD()
cname := temp_cstring(name)
crname := posix.realpath(cname, nil)
assert(crname != nil)
if crname == nil {
err = _get_platform_error()
return
}
rname := string(crname)
f := __new_file(posix.FD(handle))
f = __new_file(posix.FD(handle))
impl := (^File_Impl)(f.impl)
impl.name = rname
impl.cname = crname
return f
return f, nil
}
__new_file :: proc(handle: posix.FD) -> ^File {

4
core/os/os2/stat_posix.odin
View File

@@ -12,10 +12,10 @@ internal_stat :: proc(stat: posix.stat_t, fullpath: string) -> (fi: File_Info) {
fi.fullpath = fullpath
fi.name = filepath.base(fi.fullpath)
fi.inode = u64(stat.st_ino)
fi.inode = u128(stat.st_ino)
fi.size = i64(stat.st_size)
fi.mode = int(transmute(posix._mode_t)(stat.st_mode - posix._S_IFMT))
fi.mode = int(transmute(posix._mode_t)(stat.st_mode - posix.S_IFMT))
fi.type = .Undetermined
switch {