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

various stdio fixes

Browse Source
This commit is contained in:
Pat Hickey
2021-01-21 17:57:12 -08:00
parent f1a5dce716
commit 69b7352332
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/wasi-c2/cap-std-sync/src/stdio.rs
View File

@@ -44,7 +44,6 @@ impl WasiFile for Stdin {
} }
fn get_filestat(&self) -> Result<Filestat, Error> { fn get_filestat(&self) -> Result<Filestat, Error> {
let meta = self.0.as_file_view().metadata()?; let meta = self.0.as_file_view().metadata()?;
// XXX can unsafe-io give a way to get metadata?
Ok(Filestat { Ok(Filestat {
device_id: 0, device_id: 0,
inode: 0, inode: 0,
@@ -57,8 +56,7 @@ impl WasiFile for Stdin {
}) })
} }
fn set_filestat_size(&self, _size: u64) -> Result<(), Error> { fn set_filestat_size(&self, _size: u64) -> Result<(), Error> {
// XXX is this the right error? Err(Error::Badf)
Err(Error::Perm)
} }
fn advise(&self, _offset: u64, _len: u64, _advice: Advice) -> Result<(), Error> { fn advise(&self, _offset: u64, _len: u64, _advice: Advice) -> Result<(), Error> {
Err(Error::Badf) Err(Error::Badf)
@@ -124,7 +122,7 @@ macro_rules! wasi_file_write_impl {
Ok(()) Ok(())
} }
fn get_filetype(&self) -> Result<FileType, Error> { fn get_filetype(&self) -> Result<FileType, Error> {
Ok(FileType::CharacterDevice) // XXX wrong Ok(FileType::Unknown)
} }
fn get_fdflags(&self) -> Result<FdFlags, Error> { fn get_fdflags(&self) -> Result<FdFlags, Error> {
// XXX get_fdflags is not implemented but lets lie rather than panic: // XXX get_fdflags is not implemented but lets lie rather than panic:
@@ -134,21 +132,20 @@ macro_rules! wasi_file_write_impl {
Err(Error::Badf) Err(Error::Badf)
} }
fn get_filestat(&self) -> Result<Filestat, Error> { fn get_filestat(&self) -> Result<Filestat, Error> {
// XXX can unsafe-io give a way to get metadata? let meta = self.0.as_file_view().metadata()?;
Ok(Filestat { Ok(Filestat {
device_id: 0, device_id: 0,
inode: 0, inode: 0,
filetype: self.get_filetype()?, filetype: self.get_filetype()?,
nlink: 0, nlink: 0,
size: 0, size: meta.len(),
atim: None, atim: meta.accessed().ok(),
mtim: None, mtim: meta.modified().ok(),
ctim: None, ctim: meta.created().ok(),
}) })
} }
fn set_filestat_size(&self, _size: u64) -> Result<(), Error> { fn set_filestat_size(&self, _size: u64) -> Result<(), Error> {
// XXX is this the right error? Err(Error::Badf)
Err(Error::Perm)
} }
fn advise(&self, _offset: u64, _len: u64, _advice: Advice) -> Result<(), Error> { fn advise(&self, _offset: u64, _len: u64, _advice: Advice) -> Result<(), Error> {
Err(Error::Badf) Err(Error::Badf)