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

os2: fix read_entire_file bad logic

Browse Source
This commit is contained in:
Laytan Laats
2024-08-14 01:44:37 +02:00
parent 9f80191f60
commit 07b9f7d280
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os2/file_util.odin
+8 -10
View File
@@ -119,23 +119,20 @@ read_entire_file_from_path :: proc(name: string, allocator: runtime.Allocator) -
@(require_results) @(require_results)
read_entire_file_from_file :: proc(f: ^File, allocator: runtime.Allocator) -> (data: []byte, err: Error) { read_entire_file_from_file :: proc(f: ^File, allocator: runtime.Allocator) -> (data: []byte, err: Error) {
size: int size: int
has_size := true has_size := false
if size64, serr := file_size(f); serr == nil { if size64, serr := file_size(f); serr == nil {
if i64(int(size64)) != size64 { if i64(int(size64)) == size64 {
has_size = true
size = int(size64) size = int(size64)
} }
} else if serr == .No_Size { } else if serr != .No_Size {
has_size = false
} else {
return return
} }
size += 1 // for EOF
// TODO(bill): Is this correct logic?
if has_size { if has_size {
total: int total: int
data = make([]byte, size, allocator) or_return data = make([]byte, size, allocator) or_return
for { for total < len(data) {
n: int n: int
n, err = read(f, data[total:]) n, err = read(f, data[total:])
total += n total += n
@@ -144,15 +141,16 @@ read_entire_file_from_file :: proc(f: ^File, allocator: runtime.Allocator) -> (d
err = nil err = nil
} }
data = data[:total] data = data[:total]
return break
} }
} }
return
} else { } else {
buffer: [1024]u8 buffer: [1024]u8
out_buffer := make([dynamic]u8, 0, 0, allocator) out_buffer := make([dynamic]u8, 0, 0, allocator)
total := 0 total := 0
for { for {
n: int = --- n: int
n, err = read(f, buffer[:]) n, err = read(f, buffer[:])
total += n total += n
append_elems(&out_buffer, ..buffer[:total]) append_elems(&out_buffer, ..buffer[:total])