vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup to use question mark

Browse source
This commit is contained in:
Jeremy Soller 2016-09-08 19:31:26 -06:00
parent afde5f5b5d
commit 9afe0645e1
2 changed files with 29 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
kernel/syscall/fs.rs
View file

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

10
kernel/syscall/process.rs
View file

@ -23,10 +23,8 @@ pub fn exec(path: &[u8], args: &[[usize; 2]]) -> Result<usize> {
} }
pub fn getpid() -> Result<usize> { pub fn getpid() -> Result<usize> {
if let Some(context_lock) = context::contexts().current() { let contexts = context::contexts();
let context = context_lock.read(); let context_lock = contexts.current().ok_or(Error::NoProcess)?;
Ok(context.id) let context = context_lock.read();
} else { Ok(context.id)
Err(Error::NoProcess)
}
} }