unpfs: don't panic when an invalid fid given

Author: pfpacket

example/unpfs/src/main.rs

@@ -149,7 +149,7 @@ impl Filesystem for Unpfs {
     }
 
     fn rread(&mut self, fid: &mut Fid<Self::Fid>, offset: u64, count: u32) -> Result<Fcall> {
-        let file = fid.aux_mut().file.as_mut().unwrap();
+        let file = fid.aux_mut().file.as_mut().ok_or(INVALID_FID!())?;
         file.seek(SeekFrom::Start(offset))?;
 
         let mut buf = create_buffer(count as usize);
@@ -160,7 +160,7 @@ impl Filesystem for Unpfs {
     }
 
     fn rwrite(&mut self, fid: &mut Fid<Self::Fid>, offset: u64, data: &Data) -> Result<Fcall> {
-        let file = fid.aux_mut().file.as_mut().unwrap();
+        let file = fid.aux_mut().file.as_mut().ok_or(INVALID_FID!())?;
         file.seek(SeekFrom::Start(offset))?;
         Ok(Fcall::Rwrite { count: file.write(&data.0)? as u32 })
     }
@@ -188,7 +188,7 @@ impl Filesystem for Unpfs {
     }
 
     fn rfsync(&mut self, fid: &mut Fid<Self::Fid>) -> Result<Fcall> {
-        fid.aux_mut().file.as_mut().unwrap().sync_all()?;
+        fid.aux_mut().file.as_mut().ok_or(INVALID_FID!())?.sync_all()?;
         Ok(Fcall::Rfsync)
     }
 

example/utils.rs

@@ -11,6 +11,7 @@ macro_rules! res { ($err:expr) => { Err(From::from($err)) } }
 macro_rules! io_err { ($kind:ident, $msg:expr) => {
     ::std::io::Error::new(::std::io::ErrorKind::$kind, $msg)
 }}
+macro_rules! INVALID_FID { () => (io_err!(InvalidInput, "Invalid fid")) }
 
 pub fn create_buffer(size: usize) -> Vec<u8> {
     let mut buffer = Vec::with_capacity(size);

src/lib.rs

@@ -1,12 +1,12 @@
 
-//! Filesystems library using 9P2000.L protocol, a extended variant of 9P from the Plan 9.
+//! Filesystems library using 9P2000.L protocol, an extended variant of 9P from the Plan 9.
 //!
 //! 9P protocol is originally developed for Plan 9 distributed OS.
 //! As it's extendable and suitable for filesystems 9P is ported to Linux.
 //! However, 9P protocol lacks Linux or unix specific features,
 //! which is the problem for developing serious filesystems.
 //!
-//! 9P2000.L is a extended protocol of 9P for Linux.
+//! 9P2000.L is an extended variant protocol of 9P for Linux.
 //! It has Linux specific features and is supported by Linux kernel 9P module.
 //!
 //! rs9p is a library to develop 9P2000.L virtual filesystems in Rust.