From bbacabce4f0b7bcf0404478e3f398b1e023db58c Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 22 Sep 2016 20:49:28 -0600
Subject: [PATCH] Trim in env scheme, do not debug initfs
---
scheme/env.rs | 5 +++--
scheme/initfs.rs | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scheme/env.rs b/scheme/env.rs
index 5cabbcb0..d1f494fe 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 762d051f..e3f1d400 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);
--
GitLab