From e3317f05f7b573d54ccf647e012f9a237333ce2d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 2 Nov 2016 19:48:25 -0600 Subject: [PATCH] Remove resource_sceme, Fix syscall crate name, add fmap --- Cargo.toml | 2 +- arch/x86_64/Cargo.toml | 2 +- crates/dma/Cargo.toml | 2 +- crates/event/Cargo.toml | 4 +- crates/resource_scheme/Cargo.toml | 6 -- crates/resource_scheme/src/lib.rs | 7 -- crates/resource_scheme/src/resource.rs | 52 ------------ crates/resource_scheme/src/scheme.rs | 109 ------------------------- drivers/ahcid/Cargo.toml | 2 +- drivers/e1000d/Cargo.toml | 2 +- drivers/pcid/Cargo.toml | 4 +- drivers/ps2d/Cargo.toml | 2 +- drivers/rtl8168d/Cargo.toml | 2 +- drivers/vesad/Cargo.toml | 4 +- drivers/vesad/src/scheme.rs | 8 ++ drivers/vesad/src/screen/graphic.rs | 8 ++ drivers/vesad/src/screen/mod.rs | 2 + drivers/vesad/src/screen/text.rs | 6 +- kernel/scheme/user.rs | 61 +++++++++++--- kernel/syscall/fs.rs | 24 ++++++ kernel/syscall/mod.rs | 1 + kernel/syscall/process.rs | 5 +- libstd | 2 +- libstd_real/libc/Cargo.toml | 2 +- libstd_real/panic_unwind/Cargo.toml | 2 +- programs/extrautils | 2 +- programs/init/Cargo.toml | 2 +- programs/orbutils | 2 +- programs/pkgutils | 2 +- programs/userutils | 2 +- schemes/ethernetd/Cargo.toml | 2 +- schemes/example/Cargo.toml | 4 +- schemes/ipd/Cargo.toml | 2 +- schemes/orbital | 2 +- schemes/ptyd/Cargo.toml | 2 +- schemes/redoxfs | 2 +- schemes/tcpd/Cargo.toml | 2 +- schemes/udpd/Cargo.toml | 2 +- syscall | 2 +- 39 files changed, 130 insertions(+), 221 deletions(-) delete mode 100644 crates/resource_scheme/Cargo.toml delete mode 100644 crates/resource_scheme/src/lib.rs delete mode 100644 crates/resource_scheme/src/resource.rs delete mode 100644 crates/resource_scheme/src/scheme.rs diff --git a/Cargo.toml b/Cargo.toml index 82ebf7e..88ab2d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["staticlib"] [dependencies] bitflags = "*" spin = "*" -syscall = { path = "syscall/" } +redox_syscall = { path = "syscall/" } [dependencies.goblin] git = "https://github.com/m4b/goblin.git" diff --git a/arch/x86_64/Cargo.toml b/arch/x86_64/Cargo.toml index 7b79e99..14638c6 100644 --- a/arch/x86_64/Cargo.toml +++ b/arch/x86_64/Cargo.toml @@ -7,7 +7,7 @@ bitflags = "*" hole_list_allocator = { path = "../../crates/hole_list_allocator/" } io = { path = "../../crates/io/" } spin = "*" -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } [dependencies.x86] version = "0.7" diff --git a/crates/dma/Cargo.toml b/crates/dma/Cargo.toml index e05c929..24c1b8e 100644 --- a/crates/dma/Cargo.toml +++ b/crates/dma/Cargo.toml @@ -3,4 +3,4 @@ name = "dma" version = "0.1.0" [dependencies] -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/crates/event/Cargo.toml b/crates/event/Cargo.toml index 124d242..d382ece 100644 --- a/crates/event/Cargo.toml +++ b/crates/event/Cargo.toml @@ -2,5 +2,5 @@ name = "event" version = "0.1.0" -[dependencies.syscall] -path = "../../syscall/" +[dependencies] +redox_syscall = { path = "../../syscall/" } diff --git a/crates/resource_scheme/Cargo.toml b/crates/resource_scheme/Cargo.toml deleted file mode 100644 index 7320a1a..0000000 --- a/crates/resource_scheme/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "resource_scheme" -version = "0.1.0" - -[dependencies.syscall] -path = "../../syscall/" diff --git a/crates/resource_scheme/src/lib.rs b/crates/resource_scheme/src/lib.rs deleted file mode 100644 index 398110d..0000000 --- a/crates/resource_scheme/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -extern crate syscall; - -pub use resource::Resource; -pub use scheme::ResourceScheme; - -mod resource; -mod scheme; diff --git a/crates/resource_scheme/src/resource.rs b/crates/resource_scheme/src/resource.rs deleted file mode 100644 index 0f23183..0000000 --- a/crates/resource_scheme/src/resource.rs +++ /dev/null @@ -1,52 +0,0 @@ -use syscall::data::Stat; -use syscall::error::*; - -pub trait Resource { - /// Duplicate the resource - /// Returns `EPERM` if the operation is not supported. - fn dup(&self, _buf: &[u8]) -> Result> { - Err(Error::new(EPERM)) - } - - /// Return the path of this resource - /// Returns `EPERM` if the operation is not supported. - fn path(&self, _buf: &mut [u8]) -> Result { - Err(Error::new(EPERM)) - } - - /// Read data to buffer - /// Returns `EPERM` if the operation is not supported. - fn read(&mut self, _buf: &mut [u8]) -> Result { - Err(Error::new(EPERM)) - } - - /// Write to resource - /// Returns `EPERM` if the operation is not supported. - fn write(&mut self, _buf: &[u8]) -> Result { - Err(Error::new(EPERM)) - } - - /// Seek to the given offset - /// Returns `ESPIPE` if the operation is not supported. - fn seek(&mut self, _pos: usize, _whence: usize) -> Result { - Err(Error::new(ESPIPE)) - } - - /// Get informations about the resource, such as mode and size - /// Returns `EPERM` if the operation is not supported. - fn stat(&self, _stat: &mut Stat) -> Result { - Err(Error::new(EPERM)) - } - - /// Sync all buffers - /// Returns `EPERM` if the operation is not supported. - fn sync(&mut self) -> Result { - Err(Error::new(EPERM)) - } - - /// Truncate to the given length - /// Returns `EPERM` if the operation is not supported. - fn truncate(&mut self, _len: usize) -> Result { - Err(Error::new(EPERM)) - } -} diff --git a/crates/resource_scheme/src/scheme.rs b/crates/resource_scheme/src/scheme.rs deleted file mode 100644 index c484a94..0000000 --- a/crates/resource_scheme/src/scheme.rs +++ /dev/null @@ -1,109 +0,0 @@ -use std::slice; - -use syscall::data::{Packet, Stat}; -use syscall::error::*; -use syscall::number::*; - -use super::Resource; - -pub trait ResourceScheme { - fn open_resource(&self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result>; - - fn handle(&self, packet: &mut Packet) { - packet.a = Error::mux(match packet.a { - SYS_OPEN => self.open(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d, packet.uid, packet.gid), - SYS_MKDIR => self.mkdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d as u16, packet.uid, packet.gid), - SYS_RMDIR => self.rmdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid), - SYS_UNLINK => self.unlink(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid), - - SYS_DUP => self.dup(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }), - 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, packet.d), - SYS_FEVENT => self.fevent(packet.b, packet.c), - SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }), - SYS_FSTAT => self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) }), - SYS_FSYNC => self.fsync(packet.b), - SYS_FTRUNCATE => self.ftruncate(packet.b, packet.c), - SYS_CLOSE => self.close(packet.b), - - _ => Err(Error::new(ENOSYS)) - }); - } - - /* Scheme operations */ - fn open(&self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result { - let resource = self.open_resource(path, flags, uid, gid)?; - let resource_ptr = Box::into_raw(resource); - Ok(resource_ptr as usize) - } - - #[allow(unused_variables)] - fn mkdir(&self, path: &[u8], mode: u16, uid: u32, gid: u32) -> Result { - Err(Error::new(ENOENT)) - } - - #[allow(unused_variables)] - fn rmdir(&self, path: &[u8], uid: u32, gid: u32) -> Result { - Err(Error::new(ENOENT)) - } - - #[allow(unused_variables)] - fn unlink(&self, path: &[u8], uid: u32, gid: u32) -> Result { - Err(Error::new(ENOENT)) - } - - /* Resource operations */ - fn dup(&self, old_id: usize, buf: &[u8]) -> Result { - let old = unsafe { &*(old_id as *const T) }; - let resource = old.dup(buf)?; - let resource_ptr = Box::into_raw(resource); - Ok(resource_ptr as usize) - } - - fn read(&self, id: usize, buf: &mut [u8]) -> Result { - let mut resource = unsafe { &mut *(id as *mut T) }; - resource.read(buf) - } - - fn write(&self, id: usize, buf: &[u8]) -> Result { - let mut resource = unsafe { &mut *(id as *mut T) }; - resource.write(buf) - } - - fn seek(&self, id: usize, pos: usize, whence: usize) -> Result { - let mut resource = unsafe { &mut *(id as *mut T) }; - resource.seek(pos, whence) - } - - #[allow(unused_variables)] - fn fevent(&self, id: usize, flags: usize) -> Result { - Err(Error::new(EBADF)) - } - - fn fpath(&self, id: usize, buf: &mut [u8]) -> Result { - let resource = unsafe { &*(id as *const T) }; - resource.path(buf) - } - - fn fstat(&self, id: usize, stat: &mut Stat) -> Result { - let resource = unsafe { &*(id as *const T) }; - resource.stat(stat) - } - - fn fsync(&self, id: usize) -> Result { - let mut resource = unsafe { &mut *(id as *mut T) }; - resource.sync() - } - - fn ftruncate(&self, id: usize, len: usize) -> Result { - let mut resource = unsafe { &mut *(id as *mut T) }; - resource.truncate(len) - } - - fn close(&self, id: usize) -> Result { - let resource = unsafe { Box::from_raw(id as *mut T) }; - drop(resource); - Ok(0) - } -} diff --git a/drivers/ahcid/Cargo.toml b/drivers/ahcid/Cargo.toml index 324ea85..f718331 100644 --- a/drivers/ahcid/Cargo.toml +++ b/drivers/ahcid/Cargo.toml @@ -7,4 +7,4 @@ bitflags = "*" dma = { path = "../../crates/dma/" } io = { path = "../../crates/io/" } spin = "*" -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/drivers/e1000d/Cargo.toml b/drivers/e1000d/Cargo.toml index 9a9f2ab..ec8c45e 100644 --- a/drivers/e1000d/Cargo.toml +++ b/drivers/e1000d/Cargo.toml @@ -8,4 +8,4 @@ dma = { path = "../../crates/dma/" } event = { path = "../../crates/event/" } io = { path = "../../crates/io/" } netutils = { path = "../../programs/netutils/" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/drivers/pcid/Cargo.toml b/drivers/pcid/Cargo.toml index 222032c..a64211d 100644 --- a/drivers/pcid/Cargo.toml +++ b/drivers/pcid/Cargo.toml @@ -3,11 +3,9 @@ name = "pcid" version = "0.1.0" [dependencies] +redox_syscall = { path = "../../syscall/" } rustc-serialize = { git = "https://github.com/redox-os/rustc-serialize.git" } toml = "*" -[dependencies.syscall] -path = "../../syscall/" - [replace] "rustc-serialize:0.3.19" = { git = "https://github.com/redox-os/rustc-serialize.git" } diff --git a/drivers/ps2d/Cargo.toml b/drivers/ps2d/Cargo.toml index 0c10180..98ebbf2 100644 --- a/drivers/ps2d/Cargo.toml +++ b/drivers/ps2d/Cargo.toml @@ -7,4 +7,4 @@ bitflags = "*" event = { path = "../../crates/event/" } io = { path = "../../crates/io/" } orbclient = "0.1" -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/drivers/rtl8168d/Cargo.toml b/drivers/rtl8168d/Cargo.toml index a4243e7..e72a130 100644 --- a/drivers/rtl8168d/Cargo.toml +++ b/drivers/rtl8168d/Cargo.toml @@ -8,4 +8,4 @@ dma = { path = "../../crates/dma/" } event = { path = "../../crates/event/" } io = { path = "../../crates/io/" } netutils = { path = "../../programs/netutils/" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/drivers/vesad/Cargo.toml b/drivers/vesad/Cargo.toml index 8045332..db87c0d 100644 --- a/drivers/vesad/Cargo.toml +++ b/drivers/vesad/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" [dependencies] orbclient = "0.1" -ransid = { git = "https://github.com/redox-os/ransid.git" } +ransid = "0.2" rusttype = { git = "https://github.com/dylanede/rusttype.git", optional = true } -syscall = { path = "../../syscall/" } +redox_syscall = "0.1" [features] default = [] diff --git a/drivers/vesad/src/scheme.rs b/drivers/vesad/src/scheme.rs index c81f558..a58e7fd 100644 --- a/drivers/vesad/src/scheme.rs +++ b/drivers/vesad/src/scheme.rs @@ -72,6 +72,14 @@ impl SchemeMut for DisplayScheme { } } + fn fmap(&mut self, id: usize, offset: usize, size: usize) -> Result { + if let Some(screen) = self.screens.get(&id) { + screen.map(offset, size) + } else { + Err(Error::new(EBADF)) + } + } + fn fpath(&mut self, id: usize, buf: &mut [u8]) -> Result { let path_str = if id == 0 { format!("display:input") diff --git a/drivers/vesad/src/screen/graphic.rs b/drivers/vesad/src/screen/graphic.rs index 11a6e2e..b911922 100644 --- a/drivers/vesad/src/screen/graphic.rs +++ b/drivers/vesad/src/screen/graphic.rs @@ -45,6 +45,14 @@ impl Screen for GraphicScreen { Ok(0) } + fn map(&self, offset: usize, size: usize) -> Result { + if offset + size <= self.display.offscreen.len() * 4 { + Ok(self.display.offscreen.as_ptr() as usize + offset) + } else { + Err(Error::new(EINVAL)) + } + } + fn input(&mut self, event: &Event) { if let EventOption::Mouse(mut mouse_event) = event.to_option() { let x = cmp::max(0, cmp::min(self.display.width as i32, self.mouse_x + mouse_event.x)); diff --git a/drivers/vesad/src/screen/mod.rs b/drivers/vesad/src/screen/mod.rs index 6a0d5fd..9909694 100644 --- a/drivers/vesad/src/screen/mod.rs +++ b/drivers/vesad/src/screen/mod.rs @@ -14,6 +14,8 @@ pub trait Screen { fn event(&mut self, flags: usize) -> Result; + fn map(&self, offset: usize, size: usize) -> Result; + fn input(&mut self, event: &Event); fn read(&mut self, buf: &mut [u8]) -> Result; diff --git a/drivers/vesad/src/screen/text.rs b/drivers/vesad/src/screen/text.rs index 1fcb988..6d267d7 100644 --- a/drivers/vesad/src/screen/text.rs +++ b/drivers/vesad/src/screen/text.rs @@ -3,7 +3,7 @@ extern crate ransid; use std::collections::{BTreeSet, VecDeque}; use orbclient::{Event, EventOption}; -use syscall::Result; +use syscall::error::*; use display::Display; use screen::Screen; @@ -48,6 +48,10 @@ impl Screen for TextScreen { Ok(0) } + fn map(&self, offset: usize, size: usize) -> Result { + Err(Error::new(EBADF)) + } + fn input(&mut self, event: &Event) { let mut buf = vec![]; diff --git a/kernel/scheme/user.rs b/kernel/scheme/user.rs index 2854821..ef2bd22 100644 --- a/kernel/scheme/user.rs +++ b/kernel/scheme/user.rs @@ -1,7 +1,8 @@ -use alloc::arc::Weak; +use alloc::arc::{Arc, Weak}; +use collections::BTreeMap; use core::sync::atomic::{AtomicUsize, AtomicU64, Ordering}; use core::{mem, slice, usize}; -use spin::RwLock; +use spin::{Mutex, RwLock}; use arch; use arch::paging::{InactivePageTable, Page, VirtualAddress, entry}; @@ -23,6 +24,7 @@ pub struct UserInner { next_id: AtomicU64, context: Weak>, todo: WaitQueue, + fmap: Mutex>, usize)>>, done: WaitMap } @@ -35,6 +37,7 @@ impl UserInner { next_id: AtomicU64::new(1), context: context, todo: WaitQueue::new(), + fmap: Mutex::new(BTreeMap::new()), done: WaitMap::new() } } @@ -47,10 +50,8 @@ impl UserInner { (context.id, context.euid, context.egid) }; - let id = self.next_id.fetch_add(1, Ordering::SeqCst); - - let packet = Packet { - id: id, + self.call_inner(Packet { + id: self.next_id.fetch_add(1, Ordering::SeqCst), pid: pid, uid: uid, gid: gid, @@ -58,7 +59,11 @@ impl UserInner { b: b, c: c, d: d - }; + }) + } + + fn call_inner(&self, packet: Packet) -> Result { + let id = packet.id; let len = self.todo.send(packet); context::event::trigger(ROOT_SCHEME_ID.load(Ordering::SeqCst), self.handle_id, EVENT_READ, mem::size_of::() * len); @@ -67,18 +72,18 @@ impl UserInner { } pub fn capture(&self, buf: &[u8]) -> Result { - self.capture_inner(buf.as_ptr() as usize, buf.len(), false) + UserInner::capture_inner(&self.context, buf.as_ptr() as usize, buf.len(), false) } pub fn capture_mut(&self, buf: &mut [u8]) -> Result { - self.capture_inner(buf.as_mut_ptr() as usize, buf.len(), true) + UserInner::capture_inner(&self.context, buf.as_mut_ptr() as usize, buf.len(), true) } - fn capture_inner(&self, address: usize, size: usize, writable: bool) -> Result { + fn capture_inner(context_weak: &Weak>, address: usize, size: usize, writable: bool) -> Result { if size == 0 { Ok(0) } else { - let context_lock = self.context.upgrade().ok_or(Error::new(ESRCH))?; + let context_lock = context_weak.upgrade().ok_or(Error::new(ESRCH))?; let context = context_lock.read(); let mut grants = context.grants.lock(); @@ -165,13 +170,19 @@ impl UserInner { let len = buf.len()/packet_size; let mut i = 0; while i < len { - let packet = unsafe { *(buf.as_ptr() as *const Packet).offset(i as isize) }; + let mut packet = unsafe { *(buf.as_ptr() as *const Packet).offset(i as isize) }; if packet.id == 0 { match packet.a { SYS_FEVENT => context::event::trigger(self.scheme_id.load(Ordering::SeqCst), packet.b, packet.c, packet.d), _ => println!("Unknown scheme -> kernel message {}", packet.a) } } else { + if let Some((context_weak, size)) = self.fmap.lock().remove(&packet.id) { + if let Ok(address) = Error::demux(packet.a) { + packet.a = Error::mux(UserInner::capture_inner(&context_weak, address, size, true)); + } + } + self.done.send(packet.id, packet.a); } i += 1; @@ -269,6 +280,32 @@ impl Scheme for UserScheme { inner.call(SYS_FEVENT, file, flags, 0) } + fn fmap(&self, file: usize, offset: usize, size: usize) -> Result { + let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?; + + let (pid, uid, gid, context_lock) = { + let contexts = context::contexts(); + let context_lock = contexts.current().ok_or(Error::new(ESRCH))?; + let context = context_lock.read(); + (context.id, context.euid, context.egid, Arc::downgrade(&context_lock)) + }; + + let id = inner.next_id.fetch_add(1, Ordering::SeqCst); + + inner.fmap.lock().insert(id, (context_lock, size)); + + inner.call_inner(Packet { + id: id, + pid: pid, + uid: uid, + gid: gid, + a: SYS_FMAP, + b: file, + c: offset, + d: size + }) + } + fn fpath(&self, file: usize, buf: &mut [u8]) -> Result { let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?; let address = inner.capture_mut(buf)?; diff --git a/kernel/syscall/fs.rs b/kernel/syscall/fs.rs index 3e1a5a6..c40ec8d 100644 --- a/kernel/syscall/fs.rs +++ b/kernel/syscall/fs.rs @@ -293,3 +293,27 @@ pub fn fevent(fd: usize, flags: usize) -> Result { context::event::register(fd, file.scheme, event_id); Ok(0) } + +pub fn funmap(virtual_address: usize) -> Result { + if virtual_address == 0 { + Ok(0) + } else { + let contexts = context::contexts(); + let context_lock = contexts.current().ok_or(Error::new(ESRCH))?; + let context = context_lock.read(); + + let mut grants = context.grants.lock(); + + for i in 0 .. grants.len() { + let start = grants[i].start_address().get(); + let end = start + grants[i].size(); + if virtual_address >= start && virtual_address < end { + grants.remove(i).unmap(); + + return Ok(0); + } + } + + Err(Error::new(EFAULT)) + } +} diff --git a/kernel/syscall/mod.rs b/kernel/syscall/mod.rs index 2598cfa..952ccfa 100644 --- a/kernel/syscall/mod.rs +++ b/kernel/syscall/mod.rs @@ -41,6 +41,7 @@ pub extern fn syscall(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize SYS_CLOSE => close(b), SYS_DUP => dup(b, validate_slice(c as *const u8, d)?), SYS_FEVENT => fevent(b, c), + SYS_FUNMAP => funmap(b), _ => file_op(a, b, c, d) } }, diff --git a/kernel/syscall/process.rs b/kernel/syscall/process.rs index 39ed2ad..87053af 100644 --- a/kernel/syscall/process.rs +++ b/kernel/syscall/process.rs @@ -367,11 +367,12 @@ pub fn clone(flags: usize, stack_base: usize) -> Result { context.heap = Some(heap_shared); } + // Copy grant mapping if ! grants.lock().is_empty() { - let frame = active_table.p4()[2].pointed_frame().expect("user heap not mapped"); + let frame = active_table.p4()[2].pointed_frame().expect("user grants not mapped"); let flags = active_table.p4()[2].flags(); active_table.with(&mut new_table, &mut temporary_page, |mapper| { - mapper.p4_mut()[1].set(frame, flags); + mapper.p4_mut()[2].set(frame, flags); }); } context.grants = grants; diff --git a/libstd b/libstd index c20c669..2f7ee27 160000 --- a/libstd +++ b/libstd @@ -1 +1 @@ -Subproject commit c20c669c0eed7bd89fdce3f1f74ae82bb327bafa +Subproject commit 2f7ee270c63151c6f3242ad4f1b669a76ed48a5c diff --git a/libstd_real/libc/Cargo.toml b/libstd_real/libc/Cargo.toml index f63f100..f26d702 100644 --- a/libstd_real/libc/Cargo.toml +++ b/libstd_real/libc/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0" authors = ["Jeremy Soller "] [dependencies] -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/libstd_real/panic_unwind/Cargo.toml b/libstd_real/panic_unwind/Cargo.toml index defb0e0..b9b4fa5 100644 --- a/libstd_real/panic_unwind/Cargo.toml +++ b/libstd_real/panic_unwind/Cargo.toml @@ -4,4 +4,4 @@ version = "0.0.0" authors = ["Jeremy Soller "] [dependencies] -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/programs/extrautils b/programs/extrautils index 5c578a5..43f027a 160000 --- a/programs/extrautils +++ b/programs/extrautils @@ -1 +1 @@ -Subproject commit 5c578a59b32e298ec68218270fba0f48d9d37979 +Subproject commit 43f027a164fd550831f6e9fa9a5db393541bcbe9 diff --git a/programs/init/Cargo.toml b/programs/init/Cargo.toml index dd47c74..b045ad6 100644 --- a/programs/init/Cargo.toml +++ b/programs/init/Cargo.toml @@ -3,4 +3,4 @@ name = "init" version = "0.1.0" [dependencies] -syscall = { path = "../../syscall" } +redox_syscall = { path = "../../syscall" } diff --git a/programs/orbutils b/programs/orbutils index 4fe44e0..81d2d47 160000 --- a/programs/orbutils +++ b/programs/orbutils @@ -1 +1 @@ -Subproject commit 4fe44e0a610203d78f2e5d8fdac80d77f03bbb88 +Subproject commit 81d2d47a702cf6ac2993f4c978aaa674f86c0657 diff --git a/programs/pkgutils b/programs/pkgutils index 8561cb4..18e7916 160000 --- a/programs/pkgutils +++ b/programs/pkgutils @@ -1 +1 @@ -Subproject commit 8561cb40bdcdf9d32dea667d50d87cd9fe4c9dc6 +Subproject commit 18e7916946b6dbe75236023e24c40793fd99705d diff --git a/programs/userutils b/programs/userutils index 5ae1712..f27ed41 160000 --- a/programs/userutils +++ b/programs/userutils @@ -1 +1 @@ -Subproject commit 5ae17129d3124b990b38391c60b1b4ad150b3112 +Subproject commit f27ed41bcb2fde923824e80f2a94eae28e6c211e diff --git a/schemes/ethernetd/Cargo.toml b/schemes/ethernetd/Cargo.toml index 8861e41..6e10ca0 100644 --- a/schemes/ethernetd/Cargo.toml +++ b/schemes/ethernetd/Cargo.toml @@ -5,4 +5,4 @@ version = "0.1.0" [dependencies] event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/schemes/example/Cargo.toml b/schemes/example/Cargo.toml index 68b930f..dcd504b 100644 --- a/schemes/example/Cargo.toml +++ b/schemes/example/Cargo.toml @@ -2,5 +2,5 @@ name = "example" version = "0.1.0" -[dependencies.syscall] -path = "../../syscall/" +[dependencies] +redox_syscall = { path = "../../syscall/" } diff --git a/schemes/ipd/Cargo.toml b/schemes/ipd/Cargo.toml index e02660f..23d2f3d 100644 --- a/schemes/ipd/Cargo.toml +++ b/schemes/ipd/Cargo.toml @@ -5,4 +5,4 @@ version = "0.1.0" [dependencies] event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/schemes/orbital b/schemes/orbital index 2c366e9..9613fa4 160000 --- a/schemes/orbital +++ b/schemes/orbital @@ -1 +1 @@ -Subproject commit 2c366e9bca7ca97096a77c7c3e355eeacb6db963 +Subproject commit 9613fa4df8999179cd27ae9cdcb3c65928a0dbac diff --git a/schemes/ptyd/Cargo.toml b/schemes/ptyd/Cargo.toml index bf51e7c..c8001df 100644 --- a/schemes/ptyd/Cargo.toml +++ b/schemes/ptyd/Cargo.toml @@ -3,4 +3,4 @@ name = "ptyd" version = "0.1.0" [dependencies] -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/schemes/redoxfs b/schemes/redoxfs index a0b3817..b25b268 160000 --- a/schemes/redoxfs +++ b/schemes/redoxfs @@ -1 +1 @@ -Subproject commit a0b381765b66fe798e8b618ad5f6568cebacf0c7 +Subproject commit b25b2687567dca4b44d1d9fafcd05e4e1f5df885 diff --git a/schemes/tcpd/Cargo.toml b/schemes/tcpd/Cargo.toml index 43db502..0954e4b 100644 --- a/schemes/tcpd/Cargo.toml +++ b/schemes/tcpd/Cargo.toml @@ -6,4 +6,4 @@ version = "0.1.0" event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } rand = { git = "https://github.com/redox-os/rand.git" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/schemes/udpd/Cargo.toml b/schemes/udpd/Cargo.toml index 99ccea4..d19a81f 100644 --- a/schemes/udpd/Cargo.toml +++ b/schemes/udpd/Cargo.toml @@ -6,4 +6,4 @@ version = "0.1.0" event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } rand = { git = "https://github.com/redox-os/rand.git" } -syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../syscall/" } diff --git a/syscall b/syscall index 5a687df..416fd22 160000 --- a/syscall +++ b/syscall @@ -1 +1 @@ -Subproject commit 5a687dfeb578343431992f3a4d854f303a904486 +Subproject commit 416fd2217466519eefbbfeecce5f94db915e784c