fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-01 23:41:03 +00:00
Code Issues Projects Releases Wiki Activity

refactor getenv for windows (#156)

Browse Source
This commit is contained in:
Mackenzie Clark 2019-02-07 14:23:13 -08:00 committed by GitHub
parent 3cbad561d6
commit ea2bd80089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/emscripten/src/env/windows/mod.rs vendored
View File

@ -1,16 +1,12 @@
/// NOTE: These syscalls only support wasm_32 for now because they take u32 offset /// NOTE: These syscalls only support wasm_32 for now because they take u32 offset
use libc::{c_int, c_long, getenv}; use libc::{c_int, c_long, getenv};
use core::slice;
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::mem; use std::mem;
use std::os::raw::c_char; use std::os::raw::c_char;
use crate::utils::{ use crate::utils::{allocate_on_stack, copy_cstr_into_wasm, read_string_from_wasm};
allocate_on_stack, copy_cstr_into_wasm, copy_terminated_array_of_cstrs, read_string_from_wasm,
};
use crate::EmscriptenData; use crate::EmscriptenData;
use wasmer_runtime_core::memory::Memory;
use wasmer_runtime_core::vm::Ctx; use wasmer_runtime_core::vm::Ctx;
#[link(name = "c")] #[link(name = "c")]
@ -26,21 +22,15 @@ pub fn _getaddrinfo(_one: i32, _two: i32, _three: i32, _four: i32, _ctx: &mut Ct
// #[no_mangle] // #[no_mangle]
/// emscripten: _getenv // (name: *const char) -> *const c_char; /// emscripten: _getenv // (name: *const char) -> *const c_char;
pub fn _getenv(name: i32, ctx: &mut Ctx) -> u32 { pub fn _getenv(name: u32, ctx: &mut Ctx) -> u32 {
debug!("emscripten::_getenv"); debug!("emscripten::_getenv");
let name_string = read_string_from_wasm(ctx.memory(0), name);
let memory = ctx.memory(0); debug!("=> name({:?})", name_string);
let c_str = unsafe { getenv(name_string.as_ptr() as *const libc::c_char) };
let name_addr = emscripten_memory_pointer!(ctx.memory(0), name) as _;
debug!("=> name({:?})", unsafe { CStr::from_ptr(name_addr) });
let c_str: *mut c_char = unsafe { getenv(name_addr as _) } as _;
if c_str.is_null() { if c_str.is_null() {
return 0; return 0;
} }
unsafe { copy_cstr_into_wasm(ctx, c_str as *const c_char) }
unsafe { copy_cstr_into_wasm(ctx, c_str) }
} }
/// emscripten: _setenv // (name: *const char, name: *const value, overwrite: int); /// emscripten: _setenv // (name: *const char, name: *const value, overwrite: int);