fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

remove leading underscores from execvp and exit

Browse Source
This commit is contained in:
Mackenzie Clark 2019-03-06 10:18:00 -08:00
parent 84c8be6b33
commit b1739d93ec
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/emscripten/src/exec.rs
View File

@ -1,9 +1,9 @@
use libc::execvp;
use libc::execvp as libc_execvp;
use std::cell::Cell;
use std::ffi::CString;
use wasmer_runtime_core::vm::Ctx;
pub fn _execvp(ctx: &mut Ctx, command_name_offset: u32, argv_offset: u32) -> i32 {
pub fn execvp(ctx: &mut Ctx, command_name_offset: u32, argv_offset: u32) -> i32 {
// a single reference to re-use
let emscripten_memory = ctx.memory(0);
@ -36,5 +36,5 @@ pub fn _execvp(ctx: &mut Ctx, command_name_offset: u32, argv_offset: u32) -> i32
// construct raw pointers and hand them to `execvp`
let command_pointer = command_name_string.as_ptr() as *const i8;
let args_pointer = argv.as_ptr();
unsafe { execvp(command_pointer, args_pointer) }
unsafe { libc_execvp(command_pointer, args_pointer) }
}

4
lib/emscripten/src/exit.rs
View File

@ -1,7 +1,7 @@
use wasmer_runtime_core::vm::Ctx;
// __exit
pub fn __exit(_ctx: &mut Ctx, value: i32) {
debug!("emscripten::__exit {}", value);
pub fn exit(_ctx: &mut Ctx, value: i32) {
debug!("emscripten::exit {}", value);
::std::process::exit(value);
}

4
lib/emscripten/src/lib.rs
View File

@ -442,10 +442,10 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
"___wait" => func!(crate::lock::___wait),
// exec
"_execvp" => func!(crate::exec::_execvp),
"_execvp" => func!(crate::exec::execvp),
// exit
"__exit" => func!(crate::exit::__exit),
"__exit" => func!(crate::exit::exit),
// Env
"___assert_fail" => func!(crate::env::___assert_fail),