fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-20 04:06:30 +00:00
Code Issues Projects Releases Wiki Activity

Fixed ioctl in Unix. Fixed provied main arguments

Browse Source
This commit is contained in:
Syrus
2019-05-05 13:55:30 -07:00
parent 789af39f9e
commit 8f345e9e8c
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
lib/emscripten/src/syscalls/unix.rs
View File

@ -357,44 +357,44 @@ pub fn ___syscall54(ctx: &mut Ctx, _which: c_int, mut varargs: VarArgs) -> c_int
let request: u32 = varargs.get(ctx);
debug!("=> fd: {}, op: {}", fd, request);
// Got the equivalents here: https://code.woboq.org/linux/linux/include/uapi/asm-generic/ioctls.h.html
let argp: u32 = varargs.get(ctx);
let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
let ret = unsafe { ioctl(fd, request as _, argp_ptr) };
debug!("=> {}", ret);
ret
// match request as _ {
// 21537 => {
// // FIONBIO
// let argp: u32 = varargs.get(ctx);
// let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
// let ret = unsafe { ioctl(fd, FIONBIO, argp_ptr) };
// debug!("ret(FIONBIO): {}", ret);
// ret
// // 0
// }
// 21523 => {
// // TIOCGWINSZ
// let argp: u32 = varargs.get(ctx);
// let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
// let ret = unsafe { ioctl(fd, TIOCGWINSZ, argp_ptr) };
// debug!("ret(TIOCGWINSZ): {} (harcoded to 0)", ret);
// // ret
// // TODO: We hardcode the value to have emscripten tests pass, as for some reason
// // when the capturer is active, ioctl returns -1 instead of 0
// if ret == -1 {
// 0
// } else {
// ret
// }
// }
// _ => {
// debug!(
// "emscripten::___syscall54 -> non implemented case {}",
// request
// );
// 0
// }
// }
// let argp: u32 = varargs.get(ctx);
// let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
// let ret = unsafe { ioctl(fd, request as _, argp_ptr) };
// debug!("=> {}", ret);
// ret
match request as _ {
21537 => {
// FIONBIO
let argp: u32 = varargs.get(ctx);
let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
let ret = unsafe { ioctl(fd, FIONBIO, argp_ptr) };
debug!("ret(FIONBIO): {}", ret);
ret
// 0
}
21523 => {
// TIOCGWINSZ
let argp: u32 = varargs.get(ctx);
let argp_ptr = emscripten_memory_pointer!(ctx.memory(0), argp) as *mut c_void;
let ret = unsafe { ioctl(fd, TIOCGWINSZ, argp_ptr) };
debug!("ret(TIOCGWINSZ): {} (harcoded to 0)", ret);
// ret
// TODO: We hardcode the value to have emscripten tests pass, as for some reason
// when the capturer is active, ioctl returns -1 instead of 0
if ret == -1 {
0
} else {
ret
}
}
_ => {
debug!(
"emscripten::___syscall54 -> non implemented case {}",
request
);
0
}
}
}
// socketcall