change the preopen strategy again, implement more calls

crates/wasi-c2/src/ctx.rs

@@ -1,24 +1,22 @@
+use crate::dir::{DirEntry, WasiDir};
 use crate::file::{FileCaps, FileEntry, WasiFile};
 use crate::table::Table;
 use std::cell::{RefCell, RefMut};
-use std::collections::HashMap;
 use std::path::PathBuf;
 use std::rc::Rc;
 
 pub struct WasiCtx {
     table: Rc<RefCell<Table>>,
-    preopen_paths: RefCell<HashMap<u32, Option<PathBuf>>>,
 }
 
 impl WasiCtx {
     pub fn new() -> Self {
         WasiCtx {
             table: Rc::new(RefCell::new(Table::new())),
-            preopen_paths: RefCell::new(HashMap::new()),
         }
     }
 
-    pub fn preopen_file(
+    pub fn insert_file(
         &self,
         fd: u32,
         file: Box<dyn WasiFile>,
@@ -32,27 +30,18 @@ impl WasiCtx {
             file,
         };
         self.table().insert_at(fd, e);
-        self.preopen_paths.borrow_mut().insert(fd, path);
     }
 
-    pub fn preopen_dir(&self, fd: u32, dir: Box<dyn WasiDir>, flags: u32, path: PathBuf) {
-        let e = DirEntry { flags, dir };
+    pub fn insert_dir(&self, fd: u32, dir: Box<dyn WasiDir>, flags: u32, path: PathBuf) {
+        let e = DirEntry {
+            flags,
+            preopen_path: Some(path),
+            dir,
+        };
         self.table().insert_at(fd, e);
-        self.preopen_paths.borrow_mut().insert(fd, Some(path));
-    }
-
-    pub fn is_preopen(&self, fd: u32) -> bool {
-        self.preopen_paths.borrow().contains_key(&fd)
     }
 
     pub fn table(&self) -> RefMut<Table> {
         self.table.borrow_mut()
     }
 }
-
-pub trait WasiDir {}
-
-pub(crate) struct DirEntry {
-    pub(crate) flags: u32,
-    pub(crate) dir: Box<dyn WasiDir>,
-}