Vendor dependencies for 0.3.0 release

vendor/redox_syscall/src/scheme/generate.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Generating SchemeMut from Scheme"
+sed 's/trait Scheme/trait SchemeMut/' scheme.rs \
+| sed 's/\&self/\&mut self/g' \
+> scheme_mut.rs
+
+echo "Generating SchemeBlock from Scheme"
+sed 's/trait Scheme/trait SchemeBlock/' scheme.rs \
+| sed 's/fn handle(\&self, packet: \&mut Packet)/fn handle(\&self, packet: \&Packet) -> Option<usize>/' \
+| sed 's/packet.a = Error::mux(res);/res.transpose().map(Error::mux)/' \
+| sed 's/\.map(|f| f\.bits())/\.map(|f| f.map(|f| f.bits()))/' \
+| sed 's/\.map(|o| o as usize)/.map(|o| o.map(|o| o as usize))/' \
+| sed 's/Ok(0)/Ok(Some(0))/g' \
+| sed 's/Result<\([^>]\+\)>/Result<Option<\1>>/g' \
+| sed 's/convert_to_this_scheme/convert_to_this_scheme_block/g' \
+| sed 's/convert_in_scheme_handle/convert_in_scheme_handle_block/g' \
+> scheme_block.rs
+
+echo "Generating SchemeBlockMut from SchemeBlock"
+sed 's/trait SchemeBlock/trait SchemeBlockMut/' scheme_block.rs \
+| sed 's/\&self/\&mut self/g' \
+> scheme_block_mut.rs

vendor/redox_syscall/src/scheme/mod.rs

@@ -0,0 +1,73 @@
+use core::{slice, str};
+
+use crate::{Error, Packet, Result, EOPNOTSUPP, ESKMSG, SKMSG_FRETURNFD};
+
+pub use self::{
+    scheme::Scheme, scheme_block::SchemeBlock, scheme_block_mut::SchemeBlockMut,
+    scheme_mut::SchemeMut, seek::*,
+};
+
+unsafe fn str_from_raw_parts(ptr: *const u8, len: usize) -> Option<&'static str> {
+    let slice = slice::from_raw_parts(ptr, len);
+    str::from_utf8(slice).ok()
+}
+
+mod scheme;
+mod scheme_block;
+mod scheme_block_mut;
+mod scheme_mut;
+mod seek;
+
+pub struct CallerCtx {
+    pub pid: usize,
+    pub uid: u32,
+    pub gid: u32,
+}
+
+pub enum OpenResult {
+    ThisScheme { number: usize },
+    OtherScheme { fd: usize },
+}
+
+// TODO: Find a better solution than generate.sh
+pub(crate) fn convert_to_this_scheme(r: Result<usize>) -> Result<OpenResult> {
+    r.map(|number| OpenResult::ThisScheme { number })
+}
+pub(crate) fn convert_to_this_scheme_block(r: Result<Option<usize>>) -> Result<Option<OpenResult>> {
+    r.map(|o| o.map(|number| OpenResult::ThisScheme { number }))
+}
+pub(crate) fn convert_in_scheme_handle_block(
+    _: &Packet,
+    result: Result<Option<OpenResult>>,
+) -> Result<Option<usize>> {
+    match result {
+        Ok(Some(OpenResult::ThisScheme { number })) => Ok(Some(number)),
+        Ok(Some(OpenResult::OtherScheme { .. })) => Err(Error::new(EOPNOTSUPP)),
+        Ok(None) => Ok(None),
+        Err(err) => Err(err),
+    }
+}
+pub(crate) fn convert_in_scheme_handle(
+    packet: &mut Packet,
+    result: Result<OpenResult>,
+) -> Result<usize> {
+    match result {
+        Ok(OpenResult::ThisScheme { number }) => Ok(number),
+        Ok(OpenResult::OtherScheme { fd }) => {
+            packet.b = SKMSG_FRETURNFD;
+            packet.c = fd;
+            Err(Error::new(ESKMSG))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+impl CallerCtx {
+    pub fn from_packet(packet: &Packet) -> Self {
+        Self {
+            pid: packet.pid,
+            uid: packet.uid,
+            gid: packet.gid,
+        }
+    }
+}

vendor/redox_syscall/src/scheme/scheme.rs

@@ -0,0 +1,248 @@
+use core::{mem, slice};
+
+use crate::{data::*, error::*, flag::*, number::*, scheme::*, CallerCtx, OpenResult};
+
+pub trait Scheme {
+    fn handle(&self, packet: &mut Packet) {
+        let res = match packet.a {
+            SYS_OPEN => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    convert_in_scheme_handle(
+                        packet,
+                        self.xopen(path, packet.d, &CallerCtx::from_packet(&packet)),
+                    )
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_RMDIR => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.rmdir(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_UNLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.unlink(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+
+            SYS_DUP => convert_in_scheme_handle(
+                packet,
+                self.xdup(
+                    packet.b,
+                    unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) },
+                    &CallerCtx::from_packet(&packet),
+                ),
+            ),
+            SYS_READ => self.read(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_WRITE => self.write(packet.b, unsafe {
+                slice::from_raw_parts(packet.c as *const u8, packet.d)
+            }),
+            SYS_LSEEK => self
+                .seek(packet.b, packet.c as isize, packet.d)
+                .map(|o| o as usize),
+            SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
+            SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
+            SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
+            SYS_FEVENT => self
+                .fevent(packet.b, EventFlags::from_bits_truncate(packet.c))
+                .map(|f| f.bits()),
+            SYS_FLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.flink(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FPATH => self.fpath(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_FRENAME => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.frename(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FSTAT => {
+                if packet.d >= mem::size_of::<Stat>() {
+                    self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSTATVFS => {
+                if packet.d >= mem::size_of::<StatVfs>() {
+                    self.fstatvfs(packet.b, unsafe { &mut *(packet.c as *mut StatVfs) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSYNC => self.fsync(packet.b),
+            SYS_FTRUNCATE => self.ftruncate(packet.b, packet.c),
+            SYS_FUTIMENS => {
+                if packet.d >= mem::size_of::<TimeSpec>() {
+                    self.futimens(packet.b, unsafe {
+                        slice::from_raw_parts(
+                            packet.c as *const TimeSpec,
+                            packet.d / mem::size_of::<TimeSpec>(),
+                        )
+                    })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_CLOSE => self.close(packet.b),
+
+            KSMSG_MMAP_PREP => self.mmap_prep(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MapFlags::from_bits_truncate(packet.d),
+            ),
+            KSMSG_MUNMAP => self.munmap(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MunmapFlags::from_bits_truncate(packet.d),
+            ),
+
+            _ => Err(Error::new(ENOSYS)),
+        };
+
+        packet.a = Error::mux(res);
+    }
+
+    /* Scheme operations */
+
+    #[allow(unused_variables)]
+    fn open(&self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+    #[allow(unused_variables)]
+    fn xopen(&self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<OpenResult> {
+        convert_to_this_scheme(self.open(path, flags, ctx.uid, ctx.gid))
+    }
+
+    #[allow(unused_variables)]
+    fn chmod(&self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn rmdir(&self, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn unlink(&self, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    /* Resource operations */
+    #[allow(unused_variables)]
+    fn dup(&self, old_id: usize, buf: &[u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn xdup(&self, old_id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<OpenResult> {
+        convert_to_this_scheme(self.dup(old_id, buf))
+    }
+
+    #[allow(unused_variables)]
+    fn read(&self, id: usize, buf: &mut [u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn write(&self, id: usize, buf: &[u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn seek(&self, id: usize, pos: isize, whence: usize) -> Result<isize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchmod(&self, id: usize, mode: u16) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchown(&self, id: usize, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fcntl(&self, id: usize, cmd: usize, arg: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fevent(&self, id: usize, flags: EventFlags) -> Result<EventFlags> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn flink(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fpath(&self, id: usize, buf: &mut [u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn frename(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstat(&self, id: usize, stat: &mut Stat) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstatvfs(&self, id: usize, stat: &mut StatVfs) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fsync(&self, id: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn ftruncate(&self, id: usize, len: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn futimens(&self, id: usize, times: &[TimeSpec]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn close(&self, id: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn mmap_prep(&self, id: usize, offset: u64, size: usize, flags: MapFlags) -> Result<usize> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+
+    #[allow(unused_variables)]
+    fn munmap(&self, id: usize, offset: u64, size: usize, flags: MunmapFlags) -> Result<usize> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+}

vendor/redox_syscall/src/scheme/scheme_block.rs

@@ -0,0 +1,248 @@
+use core::{mem, slice};
+
+use crate::{data::*, error::*, flag::*, number::*, scheme::*, CallerCtx, OpenResult};
+
+pub trait SchemeBlock {
+    fn handle(&self, packet: &Packet) -> Option<usize> {
+        let res = match packet.a {
+            SYS_OPEN => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    convert_in_scheme_handle_block(
+                        packet,
+                        self.xopen(path, packet.d, &CallerCtx::from_packet(&packet)),
+                    )
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_RMDIR => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.rmdir(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_UNLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.unlink(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+
+            SYS_DUP => convert_in_scheme_handle_block(
+                packet,
+                self.xdup(
+                    packet.b,
+                    unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) },
+                    &CallerCtx::from_packet(&packet),
+                ),
+            ),
+            SYS_READ => self.read(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_WRITE => self.write(packet.b, unsafe {
+                slice::from_raw_parts(packet.c as *const u8, packet.d)
+            }),
+            SYS_LSEEK => self
+                .seek(packet.b, packet.c as isize, packet.d)
+                .map(|o| o.map(|o| o as usize)),
+            SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
+            SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
+            SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
+            SYS_FEVENT => self
+                .fevent(packet.b, EventFlags::from_bits_truncate(packet.c))
+                .map(|f| f.map(|f| f.bits())),
+            SYS_FLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.flink(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FPATH => self.fpath(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_FRENAME => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.frename(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FSTAT => {
+                if packet.d >= mem::size_of::<Stat>() {
+                    self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSTATVFS => {
+                if packet.d >= mem::size_of::<StatVfs>() {
+                    self.fstatvfs(packet.b, unsafe { &mut *(packet.c as *mut StatVfs) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSYNC => self.fsync(packet.b),
+            SYS_FTRUNCATE => self.ftruncate(packet.b, packet.c),
+            SYS_FUTIMENS => {
+                if packet.d >= mem::size_of::<TimeSpec>() {
+                    self.futimens(packet.b, unsafe {
+                        slice::from_raw_parts(
+                            packet.c as *const TimeSpec,
+                            packet.d / mem::size_of::<TimeSpec>(),
+                        )
+                    })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_CLOSE => self.close(packet.b),
+
+            KSMSG_MMAP_PREP => self.mmap_prep(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MapFlags::from_bits_truncate(packet.d),
+            ),
+            KSMSG_MUNMAP => self.munmap(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MunmapFlags::from_bits_truncate(packet.d),
+            ),
+
+            _ => Err(Error::new(ENOSYS)),
+        };
+
+        res.transpose().map(Error::mux)
+    }
+
+    /* Scheme operations */
+
+    #[allow(unused_variables)]
+    fn open(&self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+    #[allow(unused_variables)]
+    fn xopen(&self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<Option<OpenResult>> {
+        convert_to_this_scheme_block(self.open(path, flags, ctx.uid, ctx.gid))
+    }
+
+    #[allow(unused_variables)]
+    fn chmod(&self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn rmdir(&self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn unlink(&self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    /* Resource operations */
+    #[allow(unused_variables)]
+    fn dup(&self, old_id: usize, buf: &[u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn xdup(&self, old_id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<Option<OpenResult>> {
+        convert_to_this_scheme_block(self.dup(old_id, buf))
+    }
+
+    #[allow(unused_variables)]
+    fn read(&self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn write(&self, id: usize, buf: &[u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn seek(&self, id: usize, pos: isize, whence: usize) -> Result<Option<isize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchmod(&self, id: usize, mode: u16) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchown(&self, id: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fcntl(&self, id: usize, cmd: usize, arg: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fevent(&self, id: usize, flags: EventFlags) -> Result<Option<EventFlags>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn flink(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fpath(&self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn frename(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstat(&self, id: usize, stat: &mut Stat) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstatvfs(&self, id: usize, stat: &mut StatVfs) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fsync(&self, id: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn ftruncate(&self, id: usize, len: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn futimens(&self, id: usize, times: &[TimeSpec]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn close(&self, id: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn mmap_prep(&self, id: usize, offset: u64, size: usize, flags: MapFlags) -> Result<Option<usize>> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+
+    #[allow(unused_variables)]
+    fn munmap(&self, id: usize, offset: u64, size: usize, flags: MunmapFlags) -> Result<Option<usize>> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+}

vendor/redox_syscall/src/scheme/scheme_block_mut.rs

@@ -0,0 +1,248 @@
+use core::{mem, slice};
+
+use crate::{data::*, error::*, flag::*, number::*, scheme::*, CallerCtx, OpenResult};
+
+pub trait SchemeBlockMut {
+    fn handle(&mut self, packet: &Packet) -> Option<usize> {
+        let res = match packet.a {
+            SYS_OPEN => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    convert_in_scheme_handle_block(
+                        packet,
+                        self.xopen(path, packet.d, &CallerCtx::from_packet(&packet)),
+                    )
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_RMDIR => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.rmdir(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_UNLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.unlink(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+
+            SYS_DUP => convert_in_scheme_handle_block(
+                packet,
+                self.xdup(
+                    packet.b,
+                    unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) },
+                    &CallerCtx::from_packet(&packet),
+                ),
+            ),
+            SYS_READ => self.read(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_WRITE => self.write(packet.b, unsafe {
+                slice::from_raw_parts(packet.c as *const u8, packet.d)
+            }),
+            SYS_LSEEK => self
+                .seek(packet.b, packet.c as isize, packet.d)
+                .map(|o| o.map(|o| o as usize)),
+            SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
+            SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
+            SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
+            SYS_FEVENT => self
+                .fevent(packet.b, EventFlags::from_bits_truncate(packet.c))
+                .map(|f| f.map(|f| f.bits())),
+            SYS_FLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.flink(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FPATH => self.fpath(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_FRENAME => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.frename(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FSTAT => {
+                if packet.d >= mem::size_of::<Stat>() {
+                    self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSTATVFS => {
+                if packet.d >= mem::size_of::<StatVfs>() {
+                    self.fstatvfs(packet.b, unsafe { &mut *(packet.c as *mut StatVfs) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSYNC => self.fsync(packet.b),
+            SYS_FTRUNCATE => self.ftruncate(packet.b, packet.c),
+            SYS_FUTIMENS => {
+                if packet.d >= mem::size_of::<TimeSpec>() {
+                    self.futimens(packet.b, unsafe {
+                        slice::from_raw_parts(
+                            packet.c as *const TimeSpec,
+                            packet.d / mem::size_of::<TimeSpec>(),
+                        )
+                    })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_CLOSE => self.close(packet.b),
+
+            KSMSG_MMAP_PREP => self.mmap_prep(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MapFlags::from_bits_truncate(packet.d),
+            ),
+            KSMSG_MUNMAP => self.munmap(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MunmapFlags::from_bits_truncate(packet.d),
+            ),
+
+            _ => Err(Error::new(ENOSYS)),
+        };
+
+        res.transpose().map(Error::mux)
+    }
+
+    /* Scheme operations */
+
+    #[allow(unused_variables)]
+    fn open(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+    #[allow(unused_variables)]
+    fn xopen(&mut self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<Option<OpenResult>> {
+        convert_to_this_scheme_block(self.open(path, flags, ctx.uid, ctx.gid))
+    }
+
+    #[allow(unused_variables)]
+    fn chmod(&mut self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn rmdir(&mut self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn unlink(&mut self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(ENOENT))
+    }
+
+    /* Resource operations */
+    #[allow(unused_variables)]
+    fn dup(&mut self, old_id: usize, buf: &[u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn xdup(&mut self, old_id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<Option<OpenResult>> {
+        convert_to_this_scheme_block(self.dup(old_id, buf))
+    }
+
+    #[allow(unused_variables)]
+    fn read(&mut self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn write(&mut self, id: usize, buf: &[u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn seek(&mut self, id: usize, pos: isize, whence: usize) -> Result<Option<isize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchmod(&mut self, id: usize, mode: u16) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchown(&mut self, id: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fevent(&mut self, id: usize, flags: EventFlags) -> Result<Option<EventFlags>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn flink(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fpath(&mut self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn frename(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstat(&mut self, id: usize, stat: &mut Stat) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstatvfs(&mut self, id: usize, stat: &mut StatVfs) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fsync(&mut self, id: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn ftruncate(&mut self, id: usize, len: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn futimens(&mut self, id: usize, times: &[TimeSpec]) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn close(&mut self, id: usize) -> Result<Option<usize>> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn mmap_prep(&mut self, id: usize, offset: u64, size: usize, flags: MapFlags) -> Result<Option<usize>> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+
+    #[allow(unused_variables)]
+    fn munmap(&mut self, id: usize, offset: u64, size: usize, flags: MunmapFlags) -> Result<Option<usize>> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+}

vendor/redox_syscall/src/scheme/scheme_mut.rs

@@ -0,0 +1,248 @@
+use core::{mem, slice};
+
+use crate::{data::*, error::*, flag::*, number::*, scheme::*, CallerCtx, OpenResult};
+
+pub trait SchemeMut {
+    fn handle(&mut self, packet: &mut Packet) {
+        let res = match packet.a {
+            SYS_OPEN => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    convert_in_scheme_handle(
+                        packet,
+                        self.xopen(path, packet.d, &CallerCtx::from_packet(&packet)),
+                    )
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_RMDIR => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.rmdir(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_UNLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                    self.unlink(path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+
+            SYS_DUP => convert_in_scheme_handle(
+                packet,
+                self.xdup(
+                    packet.b,
+                    unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) },
+                    &CallerCtx::from_packet(&packet),
+                ),
+            ),
+            SYS_READ => self.read(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_WRITE => self.write(packet.b, unsafe {
+                slice::from_raw_parts(packet.c as *const u8, packet.d)
+            }),
+            SYS_LSEEK => self
+                .seek(packet.b, packet.c as isize, packet.d)
+                .map(|o| o as usize),
+            SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
+            SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
+            SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
+            SYS_FEVENT => self
+                .fevent(packet.b, EventFlags::from_bits_truncate(packet.c))
+                .map(|f| f.bits()),
+            SYS_FLINK => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.flink(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FPATH => self.fpath(packet.b, unsafe {
+                slice::from_raw_parts_mut(packet.c as *mut u8, packet.d)
+            }),
+            SYS_FRENAME => {
+                if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                    self.frename(packet.b, path, packet.uid, packet.gid)
+                } else {
+                    Err(Error::new(EINVAL))
+                }
+            }
+            SYS_FSTAT => {
+                if packet.d >= mem::size_of::<Stat>() {
+                    self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSTATVFS => {
+                if packet.d >= mem::size_of::<StatVfs>() {
+                    self.fstatvfs(packet.b, unsafe { &mut *(packet.c as *mut StatVfs) })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_FSYNC => self.fsync(packet.b),
+            SYS_FTRUNCATE => self.ftruncate(packet.b, packet.c),
+            SYS_FUTIMENS => {
+                if packet.d >= mem::size_of::<TimeSpec>() {
+                    self.futimens(packet.b, unsafe {
+                        slice::from_raw_parts(
+                            packet.c as *const TimeSpec,
+                            packet.d / mem::size_of::<TimeSpec>(),
+                        )
+                    })
+                } else {
+                    Err(Error::new(EFAULT))
+                }
+            }
+            SYS_CLOSE => self.close(packet.b),
+
+            KSMSG_MMAP_PREP => self.mmap_prep(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MapFlags::from_bits_truncate(packet.d),
+            ),
+            KSMSG_MUNMAP => self.munmap(
+                packet.b,
+                u64::from(packet.uid) | (u64::from(packet.gid) << 32),
+                packet.c,
+                MunmapFlags::from_bits_truncate(packet.d),
+            ),
+
+            _ => Err(Error::new(ENOSYS)),
+        };
+
+        packet.a = Error::mux(res);
+    }
+
+    /* Scheme operations */
+
+    #[allow(unused_variables)]
+    fn open(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+    #[allow(unused_variables)]
+    fn xopen(&mut self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<OpenResult> {
+        convert_to_this_scheme(self.open(path, flags, ctx.uid, ctx.gid))
+    }
+
+    #[allow(unused_variables)]
+    fn chmod(&mut self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn rmdir(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    #[allow(unused_variables)]
+    fn unlink(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(ENOENT))
+    }
+
+    /* Resource operations */
+    #[allow(unused_variables)]
+    fn dup(&mut self, old_id: usize, buf: &[u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn xdup(&mut self, old_id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<OpenResult> {
+        convert_to_this_scheme(self.dup(old_id, buf))
+    }
+
+    #[allow(unused_variables)]
+    fn read(&mut self, id: usize, buf: &mut [u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn write(&mut self, id: usize, buf: &[u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn seek(&mut self, id: usize, pos: isize, whence: usize) -> Result<isize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchmod(&mut self, id: usize, mode: u16) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fchown(&mut self, id: usize, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fevent(&mut self, id: usize, flags: EventFlags) -> Result<EventFlags> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn flink(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fpath(&mut self, id: usize, buf: &mut [u8]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn frename(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstat(&mut self, id: usize, stat: &mut Stat) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fstatvfs(&mut self, id: usize, stat: &mut StatVfs) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn fsync(&mut self, id: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn ftruncate(&mut self, id: usize, len: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn futimens(&mut self, id: usize, times: &[TimeSpec]) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn close(&mut self, id: usize) -> Result<usize> {
+        Err(Error::new(EBADF))
+    }
+
+    #[allow(unused_variables)]
+    fn mmap_prep(&mut self, id: usize, offset: u64, size: usize, flags: MapFlags) -> Result<usize> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+
+    #[allow(unused_variables)]
+    fn munmap(&mut self, id: usize, offset: u64, size: usize, flags: MunmapFlags) -> Result<usize> {
+        Err(Error::new(EOPNOTSUPP))
+    }
+}

vendor/redox_syscall/src/scheme/seek.rs

@@ -0,0 +1,41 @@
+use crate::{error::*, flag::*};
+use core::{cmp, convert::TryFrom};
+
+/// Helper for seek calls
+/// In most cases it's easier to use a usize to track the offset and buffer size internally,
+/// but the seek interface uses isize.  This wrapper ensures EOVERFLOW errors are returned
+/// as appropriate if the value in the usize can't fit in the isize.
+pub fn calc_seek_offset_usize(
+    cur_offset: usize,
+    pos: isize,
+    whence: usize,
+    buf_len: usize,
+) -> Result<isize> {
+    let cur_offset = isize::try_from(cur_offset).or_else(|_| Err(Error::new(EOVERFLOW)))?;
+    let buf_len = isize::try_from(buf_len).or_else(|_| Err(Error::new(EOVERFLOW)))?;
+    calc_seek_offset_isize(cur_offset, pos, whence, buf_len)
+}
+
+/// Helper for seek calls
+/// Result is guaranteed to be positive.
+/// EOVERFLOW returned if the arguments would cause an overflow.
+/// EINVAL returned if the new offset is out of bounds.
+pub fn calc_seek_offset_isize(
+    cur_offset: isize,
+    pos: isize,
+    whence: usize,
+    buf_len: isize,
+) -> Result<isize> {
+    let new_offset = match whence {
+        SEEK_CUR => pos.checked_add(cur_offset),
+        SEEK_END => pos.checked_add(buf_len),
+        SEEK_SET => Some(pos),
+        _ => None,
+    };
+
+    match new_offset {
+        Some(new_offset) if new_offset < 0 => Err(Error::new(EINVAL)),
+        Some(new_offset) => Ok(cmp::min(new_offset, buf_len)),
+        None => Err(Error::new(EOVERFLOW)),
+    }
+}