Connect schemes so that they can be used

kernel/syscall/fs.rs

@@ -8,23 +8,41 @@ use super::{Error, Result};
 /// Read syscall
 pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
     println!("Read {}: {:X} {}", fd, buf.as_ptr() as usize, buf.len());
-    let contexts = context::contexts();
-    let context_lock = contexts.current().ok_or(Error::NoProcess)?;
-    let context = context_lock.read();
-    let file = context.files.get(fd).ok_or(Error::BadFile)?;
+
+    let file = {
+        let contexts = context::contexts();
+        let context_lock = contexts.current().ok_or(Error::NoProcess)?;
+        let context = context_lock.read();
+        let file = context.files.get(fd).ok_or(Error::BadFile)?.ok_or(Error::BadFile)?;
+        file
+    };
+
     println!("{:?}", file);
-    Ok(0)
+
+    let schemes = scheme::schemes();
+    let scheme_mutex = schemes.get(file.scheme).ok_or(Error::BadFile)?;
+    let result = scheme_mutex.lock().read(file.number, buf);
+    result
 }
 
 /// Write syscall
 pub fn write(fd: usize, buf: &[u8]) -> Result<usize> {
     println!("Write {}: {:X} {}", fd, buf.as_ptr() as usize, buf.len());
-    let contexts = context::contexts();
-    let context_lock = contexts.current().ok_or(Error::NoProcess)?;
-    let context = context_lock.read();
-    let file = context.files.get(fd).ok_or(Error::BadFile);
+
+    let file = {
+        let contexts = context::contexts();
+        let context_lock = contexts.current().ok_or(Error::NoProcess)?;
+        let context = context_lock.read();
+        let file = context.files.get(fd).ok_or(Error::BadFile)?.ok_or(Error::BadFile)?;
+        file
+    };
+
     println!("{:?}: {:?}", file, ::core::str::from_utf8(buf));
-    Ok(buf.len())
+
+    let schemes = scheme::schemes();
+    let scheme_mutex = schemes.get(file.scheme).ok_or(Error::BadFile)?;
+    let result = scheme_mutex.lock().write(file.number, buf);
+    result
 }
 
 /// Open syscall
@@ -34,20 +52,20 @@ pub fn open(path: &[u8], flags: usize) -> Result<usize> {
     let reference_opt = parts.next();
     println!("Open namespace {:?} reference {:?}: {:X}", namespace_opt.map(::core::str::from_utf8), reference_opt.map(::core::str::from_utf8), flags);
 
-    let file = {
+    let (scheme_id, file_id) = {
         let namespace = namespace_opt.ok_or(Error::NoEntry)?;
         let schemes = scheme::schemes();
-        let scheme_mutex = schemes.get(namespace).ok_or(Error::NoEntry)?;
-        let file = scheme_mutex.lock().open(reference_opt.unwrap_or(b""), flags)?;
-        file
+        let (scheme_id, scheme_mutex) = schemes.get_name(namespace).ok_or(Error::NoEntry)?;
+        let file_id = scheme_mutex.lock().open(reference_opt.unwrap_or(b""), flags)?;
+        (scheme_id, file_id)
     };
 
     let contexts = context::contexts();
     let context_lock = contexts.current().ok_or(Error::NoProcess)?;
     let mut context = context_lock.write();
     context.add_file(::context::file::File {
-        scheme: 0,
-        number: file
+        scheme: scheme_id,
+        number: file_id
     }).ok_or(Error::TooManyFiles)
 }
 

kernel/syscall/mod.rs

@@ -64,6 +64,8 @@ pub enum Error {
     BadFile = 9,
     /// Try again
     TryAgain = 11,
+    /// File exists
+    FileExists = 17,
     /// Invalid argument
     InvalidValue = 22,
     /// Too many open files