diff --git a/scheme/env.rs b/scheme/env.rs index 5cabbcb019281ddde867d0107ae9f9e339d1a7fa..d1f494feb3b6052cf0e76fa07588384beefa7bce 100644 --- a/scheme/env.rs +++ b/scheme/env.rs @@ -1,5 +1,5 @@ use collections::BTreeMap; -use core::cmp; +use core::{cmp, str}; use core::sync::atomic::{AtomicUsize, Ordering}; use spin::RwLock; @@ -41,7 +41,8 @@ impl EnvScheme { impl Scheme for EnvScheme { fn open(&self, path: &[u8], _flags: usize) -> Result<usize> { - let data = self.files.get(path).ok_or(Error::new(ENOENT))?; + let path = str::from_utf8(path).map_err(|_err| Error::new(ENOENT))?.trim_matches('/'); + let data = self.files.get(path.as_bytes()).ok_or(Error::new(ENOENT))?; let id = self.next_id.fetch_add(1, Ordering::SeqCst); self.handles.write().insert(id, Handle { diff --git a/scheme/initfs.rs b/scheme/initfs.rs index 762d051f64ad7406bae88f4b5d1cf0c80ad6c817..e3f1d4006b912576d03b07b9dd6abc8b2186dfb5 100644 --- a/scheme/initfs.rs +++ b/scheme/initfs.rs @@ -36,7 +36,6 @@ impl InitFsScheme { impl Scheme for InitFsScheme { fn open(&self, path: &[u8], _flags: usize) -> Result<usize> { let path = str::from_utf8(path).map_err(|_err| Error::new(ENOENT))?.trim_matches('/'); - println!("{}", path); let file = self.files.get(path.as_bytes()).ok_or(Error::new(ENOENT))?; let id = self.next_id.fetch_add(1, Ordering::SeqCst);