Merge remote-tracking branch 'origin/feature/wasi' into feature/wasi

wasmerio · Apr 4, 2019 · 2686322 · 2686322
2 parents 207bd01 + c1c99db
commit 2686322
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/wasi/src/state.rs b/lib/wasi/src/state.rs
@@ -63,7 +63,7 @@ impl WasiFs {
         Ok(Self {
             repo: RepoOpener::new()
                 .create(true)
-                .open("mem://foo", "")
+                .open("mem://wasmer-test-fs", "")
                 .map_err(|e| e.to_string())?,
             name_map: HashMap::new(),
             inodes: Arena::new(),

diff --git a/lib/wasi/src/syscalls/mod.rs b/lib/wasi/src/syscalls/mod.rs
@@ -8,7 +8,7 @@ pub mod windows;
 use self::types::*;
 use crate::{
     ptr::{Array, WasmPtr},
-    state::{Kind, WasiState, MAX_SYMLINKS},
+    state::{Fd, Kind, WasiState, MAX_SYMLINKS},
 };
 use rand::{thread_rng, Rng};
 use std::cell::Cell;
@@ -768,7 +768,14 @@ pub fn fd_renumber(ctx: &mut Ctx, from: __wasi_fd_t, to: __wasi_fd_t) -> __wasi_
     let state = get_wasi_state(ctx);
     let fd_entry = wasi_try!(state.fs.fd_map.get(&from).ok_or(__WASI_EBADF));
 
-    state.fs.fd_map.insert(to, fd_entry.clone());
+    state.fs.fd_map.insert(
+        to,
+        Fd {
+            // TODO: verify this is correct
+            rights: fd_entry.rights_inheriting,
+            ..*fd_entry
+        },
+    );
     __WASI_ESUCCESS
 }