From 0b2f357bbedda1e3c21bc61a46fd34827091d815 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Wed, 13 Dec 2023 02:33:05 +0100 Subject: [PATCH] fix eof logic --- core/os/stream.odin | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/core/os/stream.odin b/core/os/stream.odin index 4c0b35600..d7ce11d26 100644 --- a/core/os/stream.odin +++ b/core/os/stream.odin @@ -27,19 +27,31 @@ _file_stream_proc :: proc(stream_data: rawptr, mode: io.Stream_Mode, p: []byte, case .Read: n_int, os_err = read(fd, p) n = i64(n_int) + if n == 0 && os_err == 0 { + err = .EOF + } case .Read_At: when !(ODIN_OS == .FreeBSD || ODIN_OS == .OpenBSD) { n_int, os_err = read_at(fd, p, offset) n = i64(n_int) + if n == 0 && os_err == 0 { + err = .EOF + } } case .Write: n_int, os_err = write(fd, p) n = i64(n_int) + if n == 0 && os_err == 0 { + err = .EOF + } case .Write_At: when !(ODIN_OS == .FreeBSD || ODIN_OS == .OpenBSD) { n_int, os_err = write_at(fd, p, offset) n = i64(n_int) + if n == 0 && os_err == 0 { + err = .EOF + } } case .Seek: n, os_err = seek(fd, offset, int(whence)) @@ -63,12 +75,5 @@ _file_stream_proc :: proc(stream_data: rawptr, mode: io.Stream_Mode, p: []byte, } err = .Unknown } - - when ODIN_OS != .Windows { - if err == nil && os_err == 0 && n == 0 { - err = .EOF - } - } - return }