Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More type cast fixes

Browse Source
This commit is contained in:
Andrea Orru 2018-08-06 02:42:12 -04:00
parent 641066d82e
commit 79d77faebf
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
std/os/zen.zig
View File

@ -80,11 +80,15 @@ pub const STDOUT_FILENO = 1;
pub const STDERR_FILENO = 2; pub const STDERR_FILENO = 2;
// FIXME: let's borrow Linux's error numbers for now. // FIXME: let's borrow Linux's error numbers for now.
pub const getErrno = @import("linux/index.zig").getErrno;
use @import("linux/errno.zig"); use @import("linux/errno.zig");
// Get the errno from a syscall return value, or 0 for no error.
pub fn getErrno(r: usize) usize {
const signed_r = @bitCast(isize, r);
return if (signed_r > -4096 and signed_r < 0) @intCast(usize, -signed_r) else 0;
}
// TODO: implement this correctly. // TODO: implement this correctly.
pub fn read(fd: i32, buf: *u8, count: usize) usize { pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
switch (fd) { switch (fd) {
STDIN_FILENO => { STDIN_FILENO => {
var i: usize = 0; var i: usize = 0;
@ -93,9 +97,9 @@ pub fn read(fd: i32, buf: *u8, count: usize) usize {
// FIXME: we should be certain that we are receiving from Keyboard. // FIXME: we should be certain that we are receiving from Keyboard.
var message = Message.from(MailboxId.This); var message = Message.from(MailboxId.This);
receive(message.*); receive(&message);
buf[i] = u8(message.args[0]); buf[i] = @intCast(u8, message.args[0]);
} }
}, },
else => unreachable, else => unreachable,
@ -104,7 +108,7 @@ pub fn read(fd: i32, buf: *u8, count: usize) usize {
} }
// TODO: implement this correctly. // TODO: implement this correctly.
pub fn write(fd: i32, buf: *const u8, count: usize) usize { pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
switch (fd) { switch (fd) {
STDOUT_FILENO, STDERR_FILENO => { STDOUT_FILENO, STDERR_FILENO => {
send(Message.to(Server.Terminal, 1) send(Message.to(Server.Terminal, 1)