fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-28 11:52:15 +00:00
Code Issues Projects Releases Wiki Activity

apply base path update to wasi::path_filestat_get

Browse Source
This commit is contained in:
Mark McCaskey 2019-05-15 10:25:31 -07:00
parent 6b43a6a313
commit ace7a19a7b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/wasi/src/syscalls/mod.rs
View File

@ -791,6 +791,7 @@ pub fn fd_readdir(
let entry_path = entry.path(); let entry_path = entry.path();
let entry_path_str = entry_path.to_string_lossy(); let entry_path_str = entry_path.to_string_lossy();
let namlen = entry_path_str.len(); let namlen = entry_path_str.len();
debug!("Returning dirent for {}", entry_path_str);
let dirent = __wasi_dirent_t { let dirent = __wasi_dirent_t {
d_next: cur_cookie, d_next: cur_cookie,
d_ino: 0, // TODO: inode d_ino: 0, // TODO: inode
@ -1151,7 +1152,10 @@ pub fn path_filestat_get(
if path_vec.is_empty() { if path_vec.is_empty() {
return __WASI_EINVAL; return __WASI_EINVAL;
} }
let mut cumulative_path = std::path::PathBuf::new(); let mut cumulative_path = std::path::PathBuf::from(wasi_try!(state
.fs
.get_base_path_for_directory(root_dir.inode)
.ok_or(__WASI_EIO)));
debug!("=> Path vec: {:?}:", &path_vec); debug!("=> Path vec: {:?}:", &path_vec);
// find the inode by traversing the path // find the inode by traversing the path
@ -1455,7 +1459,6 @@ pub fn path_open(
}; };
// TODO: handle __WASI_O_TRUNC on directories // TODO: handle __WASI_O_TRUNC on directories
dbg!(&cumulative_path);
// TODO: refactor and reuse // TODO: refactor and reuse
let cur_file_metadata = let cur_file_metadata =
wasi_try!(cumulative_path.metadata().map_err(|_| __WASI_EINVAL)); wasi_try!(cumulative_path.metadata().map_err(|_| __WASI_EINVAL));
@ -1554,10 +1557,8 @@ pub fn path_open(
open_options open_options
}; };
debug!("Opening host file {:?}", &file_path); debug!("Opening host file {:?}", &file_path);
let real_open_file = wasi_try!(open_options.open(&file_path).map_err(|e| { let real_open_file =
dbg!(e); wasi_try!(open_options.open(&file_path).map_err(|_| __WASI_EIO));
__WASI_EIO
}));
real_open_file real_open_file
}; };