T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sorta fix set_times on paths and dirfds

Browse Source
This commit is contained in:
Pat Hickey
2021-01-05 14:28:26 -08:00
parent ce13cd9e77
commit 56788be629
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/wasi-c2/TEST_FAILURES
View File

@@ -2,8 +2,8 @@
TODOs:
* symlink following behavior, trailing slash behavior (closely related to
symlinks) in cap-std isnt ready yet.
* path_filestat_set_times, fd_filestat_set_times: no way to set times of a
path or for a Dir
* path_filestat_set_times, fd_filestat_set_times: different types used to set
times for a Dir vs a File, this is a fs_set_times vs cap_fs_ext divergence
* File::set_fdflags is unimplemented, File::get_fdflags is lying - these are
fcntl on unix, reopenfile / ?? on windows. Not implemented in system-interface yet.
* async scheduling!

33
crates/wasi-c2/src/snapshots/preview_1.rs
View File

@@ -685,7 +685,38 @@ impl<'a> wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
let table = self.table();
let dir_entry: Ref<DirEntry> = table.get(u32::from(dirfd))?;
let dir = dir_entry.get_cap(DirCaps::PATH_FILESTAT_SET_TIMES)?;
todo!()
let path = path.as_str()?;
// XXX DRY these are in fd_filestat_set_times twice!
let set_atim = fst_flags.contains(&types::Fstflags::ATIM);
let set_atim_now = fst_flags.contains(&types::Fstflags::ATIM_NOW);
let set_mtim = fst_flags.contains(&types::Fstflags::MTIM);
let set_mtim_now = fst_flags.contains(&types::Fstflags::MTIM_NOW);
if (set_atim && set_atim_now) || (set_mtim && set_mtim_now) {
return Err(Error::Inval);
}
use cap_fs_ext::SystemTimeSpec;
use cap_std::time::{Duration, SystemClock};
let atim = if set_atim {
Some(SystemTimeSpec::Absolute(
SystemClock::UNIX_EPOCH + Duration::from_nanos(atim),
))
} else if set_atim_now {
Some(SystemTimeSpec::SymbolicNow)
} else {
None
};
let mtim = if set_mtim {
Some(SystemTimeSpec::Absolute(
SystemClock::UNIX_EPOCH + Duration::from_nanos(mtim),
))
} else if set_mtim_now {
Some(SystemTimeSpec::SymbolicNow)
} else {
None
};
dir.set_times(path.deref(), atim, mtim)
}
fn path_link(