Perform cloexec in kernel

This commit is contained in:
Jeremy Soller
2017-04-16 12:52:07 -06:00
parent f418d30dc9
commit f0c38fe609
2 changed files with 12 additions and 16 deletions
+10 -14
View File
@@ -3,11 +3,11 @@ use redoxfs::FileSystem;
use std::cmp::{min, max};
use syscall::error::{Error, Result, EBADF, EINVAL};
use syscall::flag::{O_ACCMODE, O_CLOEXEC, O_RDONLY, O_WRONLY, O_RDWR, F_GETFL, F_SETFL};
use syscall::flag::{O_ACCMODE, O_RDONLY, O_WRONLY, O_RDWR, F_GETFL, F_SETFL};
use syscall::{Stat, SEEK_SET, SEEK_CUR, SEEK_END};
pub trait Resource {
fn dup(&self, buf: &[u8]) -> Result<Box<Resource>>;
fn dup(&self) -> Result<Box<Resource>>;
fn read(&mut self, buf: &mut [u8], fs: &mut FileSystem) -> Result<usize>;
fn write(&mut self, buf: &[u8], fs: &mut FileSystem) -> Result<usize>;
fn seek(&mut self, offset: usize, whence: usize, fs: &mut FileSystem) -> Result<usize>;
@@ -37,7 +37,7 @@ impl DirResource {
}
impl Resource for DirResource {
fn dup(&self, _buf: &[u8]) -> Result<Box<Resource>> {
fn dup(&self) -> Result<Box<Resource>> {
Ok(Box::new(DirResource {
path: self.path.clone(),
block: self.block,
@@ -128,17 +128,13 @@ impl FileResource {
}
impl Resource for FileResource {
fn dup(&self, buf: &[u8]) -> Result<Box<Resource>> {
if buf == b"exec" && self.flags & O_CLOEXEC == O_CLOEXEC {
Err(Error::new(EBADF))
} else {
Ok(Box::new(FileResource {
path: self.path.clone(),
block: self.block,
flags: self.flags,
seek: self.seek,
}))
}
fn dup(&self) -> Result<Box<Resource>> {
Ok(Box::new(FileResource {
path: self.path.clone(),
block: self.block,
flags: self.flags,
seek: self.seek,
}))
}
fn read(&mut self, buf: &mut [u8], fs: &mut FileSystem) -> Result<usize> {
+2 -2
View File
@@ -297,12 +297,12 @@ impl Scheme for FileScheme {
/* Resource operations */
#[allow(unused_variables)]
fn dup(&self, old_id: usize, buf: &[u8]) -> Result<usize> {
fn dup(&self, old_id: usize, _buf: &[u8]) -> Result<usize> {
// println!("Dup {}", old_id);
let mut files = self.files.lock();
let resource = if let Some(old_resource) = files.get(&old_id) {
old_resource.dup(buf)?
old_resource.dup()?
} else {
return Err(Error::new(EBADF));
};