Add os.stream_from_handle; fix io.close

This commit is contained in:
gingerBill
2020-12-02 23:39:33 +00:00
parent c4172e3914
commit 0cf3ae93c0
2 changed files with 65 additions and 2 deletions
+3 -2
View File
@@ -113,11 +113,12 @@ Rune_Scanner :: struct {using stream: Stream};
destroy :: proc(s: Stream) -> Error {
close_err := close({s});
if s.stream_vtable != nil && s.impl_destroy != nil {
return s->impl_destroy();
}
// Instead of .Empty, .None is fine in this case
return .None;
return close_err;
}
read :: proc(s: Reader, p: []byte) -> (n: int, err: Error) {
@@ -141,7 +142,7 @@ seek :: proc(s: Seeker, offset: i64, whence: Seek_From) -> (n: i64, err: Error)
return 0, .Empty;
}
close :: proc(s: Closer, p: []byte) -> Error {
close :: proc(s: Closer) -> Error {
if s.stream_vtable != nil && s.impl_close != nil {
return s->impl_close();
}
+62
View File
@@ -0,0 +1,62 @@
package os
import "core:io"
stream_from_handle :: proc(fd: Handle) -> io.Stream {
s: io.Stream;
s.stream_data = rawptr(uintptr(fd));
s.stream_vtable = _file_stream_vtable;
return s;
}
_file_stream_vtable := &io.Stream_VTable{
impl_read = proc(s: io.Stream, p: []byte) -> (n: int, err: io.Error) {
fd := Handle(uintptr(s.stream_data));
os_err: Errno;
n, os_err = read(fd, p);
return;
},
impl_read_at = proc(s: io.Stream, p: []byte, offset: i64) -> (n: int, err: io.Error) {
fd := Handle(uintptr(s.stream_data));
os_err: Errno;
n, os_err = read_at(fd, p, offset);
return;
},
impl_write = proc(s: io.Stream, p: []byte) -> (n: int, err: io.Error) {
fd := Handle(uintptr(s.stream_data));
os_err: Errno;
n, os_err = write(fd, p);
return;
},
impl_write_at = proc(s: io.Stream, p: []byte, offset: i64) -> (n: int, err: io.Error) {
fd := Handle(uintptr(s.stream_data));
os_err: Errno;
n, os_err = write_at(fd, p, offset);
return;
},
impl_seek = proc(s: io.Stream, offset: i64, whence: io.Seek_From) -> (i64, io.Error) {
fd := Handle(uintptr(s.stream_data));
n, os_err := seek(fd, offset, int(whence));
return n, nil;
},
impl_size = proc(s: io.Stream) -> i64 {
fd := Handle(uintptr(s.stream_data));
sz, _ := file_size(fd);
return sz;
},
impl_flush = proc(s: io.Stream) -> io.Error {
fd := Handle(uintptr(s.stream_data));
when ODIN_OS == "windows" {
flush(fd);
} else {
// TOOD(bill): other operating systems
}
return nil;
},
impl_close = proc(s: io.Stream) -> io.Error {
fd := Handle(uintptr(s.stream_data));
close(fd);
return nil;
},
};