From 9a89ed174c8e4d839d780a8e8c59239c08416e59 Mon Sep 17 00:00:00 2001
From: WangRunji <wangrunji0408@163.com>
Date: Mon, 4 Mar 2019 17:11:21 +0800
Subject: [PATCH] fix zip bug. impl std::Error for FsError.

---
 rcore-fs-fuse/src/zip.rs | 40 +++++++++++++++++++++-------------------
 rcore-fs/src/vfs.rs      | 12 +++++++++++-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/rcore-fs-fuse/src/zip.rs b/rcore-fs-fuse/src/zip.rs
index 10a3888..3d1c395 100644
--- a/rcore-fs-fuse/src/zip.rs
+++ b/rcore-fs-fuse/src/zip.rs
@@ -1,55 +1,57 @@
 use std::fs;
-use std::io::{Read, Result, Write};
+use std::io::{Read, Write};
 use std::mem::uninitialized;
 use std::path::Path;
 use std::sync::Arc;
+use std::error::Error;
 
-use rcore_fs::vfs::*;
+use rcore_fs::vfs::{INode, FileType, FsError};
 
 const DEFAULT_MODE: u32 = 0o664;
+const BUF_SIZE: usize = 0x1000;
 
-pub fn zip_dir(path: &Path, inode: Arc<INode>) -> Result<()> {
-    let dir = fs::read_dir(path).expect("Failed to open dir");
+pub fn zip_dir(path: &Path, inode: Arc<INode>) -> Result<(), Box<Error>> {
+    let dir = fs::read_dir(path)?;
     for entry in dir {
         let entry = entry?;
         let name_ = entry.file_name();
         let name = name_.to_str().unwrap();
         let type_ = entry.file_type()?;
         if type_.is_file() {
-            let inode = inode.create(name, FileType::File, DEFAULT_MODE).expect("Failed to create INode");
+            let inode = inode.create(name, FileType::File, DEFAULT_MODE)?;
             let mut file = fs::File::open(entry.path())?;
-            inode.resize(file.metadata().unwrap().len() as usize).expect("Failed to resize INode");
-            let mut buf: [u8; 4096] = unsafe { uninitialized() };
+            inode.resize(file.metadata()?.len() as usize)?;
+            let mut buf: [u8; BUF_SIZE] = unsafe { uninitialized() };
             let mut offset = 0usize;
-            let mut len = 4096;
-            while len == 4096 {
+            let mut len = BUF_SIZE;
+            while len == BUF_SIZE {
                 len = file.read(&mut buf)?;
-                inode.write_at(offset, &buf).expect("Failed to write image");
+                inode.write_at(offset, &buf[..len])?;
                 offset += len;
             }
         } else if type_.is_dir() {
-            let inode = inode.create(name, FileType::Dir, DEFAULT_MODE).expect("Failed to create INode");
+            let inode = inode.create(name, FileType::Dir, DEFAULT_MODE)?;
             zip_dir(entry.path().as_path(), inode)?;
         }
     }
     Ok(())
 }
 
-pub fn unzip_dir(path: &Path, inode: Arc<INode>) -> Result<()> {
-    let files = inode.list().expect("Failed to list files from INode");
+pub fn unzip_dir(path: &Path, inode: Arc<INode>) -> Result<(), Box<Error>> {
+    let files = inode.list()?;
     for name in files.iter().skip(2) {
-        let inode = inode.lookup(name.as_str()).expect("Failed to lookup");
+        let inode = inode.lookup(name.as_str())?;
         let mut path = path.to_path_buf();
         path.push(name);
-        let info = inode.metadata().expect("Failed to get file info");
+        let info = inode.metadata()?;
         match info.type_ {
             FileType::File => {
                 let mut file = fs::File::create(&path)?;
-                let mut buf: [u8; 4096] = unsafe { uninitialized() };
+                let mut buf: [u8; BUF_SIZE] = unsafe { uninitialized() };
                 let mut offset = 0usize;
-                let mut len = 4096;
-                while len == 4096 {
-                    len = inode.read_at(offset, buf.as_mut()).expect("Failed to read from INode");
+                let mut len = BUF_SIZE;
+                while len == BUF_SIZE {
+                    len = inode.read_at(offset, buf.as_mut())?;
                     file.write(&buf[..len])?;
                     offset += len;
                 }
diff --git a/rcore-fs/src/vfs.rs b/rcore-fs/src/vfs.rs
index 2482c4a..d1ba2b0 100644
--- a/rcore-fs/src/vfs.rs
+++ b/rcore-fs/src/vfs.rs
@@ -1,6 +1,7 @@
 use alloc::{vec::Vec, string::String, sync::Arc};
 use core::any::Any;
 use core::result;
+use core::fmt;
 
 /// Abstract operations on a inode.
 pub trait INode: Any + Sync + Send {
@@ -170,7 +171,16 @@ pub enum FsError {
     DeviceError,
 }
 
-pub type Result<T> = result::Result<T,FsError>;
+impl fmt::Display for FsError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
+#[cfg(any(test, feature = "std"))]
+impl std::error::Error for FsError {}
+
+pub type Result<T> = result::Result<T, FsError>;
 
 /// Abstract filesystem
 pub trait FileSystem: Sync {