Specify crates.io versions, update rust, cleanup modules

This commit is contained in:
Jeremy Soller 2017-01-13 15:10:43 -07:00
parent 8a6d99e3f4
commit fc0e54ac68
21 changed files with 18 additions and 69 deletions

3
.gitmodules vendored
View file

@ -43,9 +43,6 @@
[submodule "installer"] [submodule "installer"]
path = installer path = installer
url = https://github.com/redox-os/installer.git url = https://github.com/redox-os/installer.git
[submodule "syscall"]
path = syscall
url = https://github.com/redox-os/syscall.git
[submodule "crates/docgen"] [submodule "crates/docgen"]
path = crates/docgen path = crates/docgen
url = https://github.com/redox-os/docgen.git url = https://github.com/redox-os/docgen.git

View file

@ -26,13 +26,11 @@ members = [
"programs/tar", "programs/tar",
"programs/userutils", "programs/userutils",
"schemes/ethernetd", "schemes/ethernetd",
"schemes/example",
"schemes/ipd", "schemes/ipd",
"schemes/orbital", "schemes/orbital",
"schemes/ptyd", "schemes/ptyd",
"schemes/randd", "schemes/randd",
"schemes/redoxfs", "schemes/redoxfs",
"schemes/tcpd", "schemes/tcpd",
"schemes/udpd", "schemes/udpd"
"syscall"
] ]

@ -1 +1 @@
Subproject commit 778852f92d835c17327819bde28c19db8096a4b1 Subproject commit 4bb229959e7c662a0686c7986f5ad28c8fb4de12

2
kernel

@ -1 +1 @@
Subproject commit 35c22977240597d656979fd5d9bdb25a755bb372 Subproject commit 04d9d6b40a8fbd5e21200dabfdaa128a4c809727

View file

@ -3,4 +3,4 @@ name = "contain"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

@ -1 +1 @@
Subproject commit 30dae30ee0c4d4628f08b04db9d7f986cc975763 Subproject commit 86464b0b198c490b8e958c587e179c7aa8f24065

@ -1 +1 @@
Subproject commit f371a0684e816d8ebf12446c3f6c799bd276efa6 Subproject commit 2a770bdf6b2979a89e7b128830083fa1d049357a

View file

@ -3,4 +3,4 @@ name = "init"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

@ -1 +1 @@
Subproject commit cf1e1f8e6406e9b01a2c62e46260e82a7aa33395 Subproject commit 44027c23b7cb58d03e3408ff7a87a76d57a47ff8

@ -1 +1 @@
Subproject commit 2fdef17559bd25d7f6cd5c2a0a4d1b7897e0beaf Subproject commit 2011976381b9eb1264ae90218106fa36a19427c8

2
rust

@ -1 +1 @@
Subproject commit 82a3f9fbecd3b4cfac2ac4821ce330227dbdedb0 Subproject commit ca2ade1d36d0b33d60ff1973ab6c8f3b09bc4c41

View file

@ -5,4 +5,4 @@ version = "0.1.0"
[dependencies] [dependencies]
netutils = { git = "https://github.com/redox-os/netutils.git" } netutils = { git = "https://github.com/redox-os/netutils.git" }
redox_event = { git = "https://github.com/redox-os/event.git" } redox_event = { git = "https://github.com/redox-os/event.git" }
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

View file

@ -1,6 +0,0 @@
[package]
name = "example"
version = "0.1.0"
[dependencies]
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }

View file

@ -1,39 +0,0 @@
extern crate syscall;
use std::fs::File;
use std::io::{Read, Write};
use std::str;
use syscall::{Packet, Result, Scheme};
struct ExampleScheme;
impl Scheme for ExampleScheme {
fn open(&self, path: &[u8], _flags: usize, uid: u32, gid: u32) -> Result<usize> {
println!("{} from {}:{}", unsafe { str::from_utf8_unchecked(path) }, uid, gid);
Ok(0)
}
fn dup(&self, file: usize, _buf: &[u8]) -> Result<usize> {
Ok(file)
}
fn close(&self, _file: usize) -> Result<usize> {
Ok(0)
}
}
fn main(){
// Daemonize
if unsafe { syscall::clone(0).unwrap() } == 0 {
let mut socket = File::create(":example").expect("example: failed to create example scheme");
let scheme = ExampleScheme;
loop {
let mut packet = Packet::default();
socket.read(&mut packet).expect("example: failed to read events from example scheme");
println!("{:?}", packet);
scheme.handle(&mut packet);
socket.write(&packet).expect("example: failed to write responses to example scheme");
}
}
}

View file

@ -5,4 +5,4 @@ version = "0.1.0"
[dependencies] [dependencies]
netutils = { git = "https://github.com/redox-os/netutils.git" } netutils = { git = "https://github.com/redox-os/netutils.git" }
redox_event = { git = "https://github.com/redox-os/event.git" } redox_event = { git = "https://github.com/redox-os/event.git" }
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

@ -1 +1 @@
Subproject commit baa69a2fa69b827645e59abc389f5a162d76f035 Subproject commit c70e11f9e94a0bf445aa1c96243a514ee5b46d3e

View file

@ -3,4 +3,4 @@ name = "ptyd"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

View file

@ -3,5 +3,5 @@ name = "randd"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
raw-cpuid = "2.*" raw-cpuid = "2.0"
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

View file

@ -6,4 +6,4 @@ version = "0.1.0"
netutils = { git = "https://github.com/redox-os/netutils.git" } netutils = { git = "https://github.com/redox-os/netutils.git" }
rand = "0.3" rand = "0.3"
redox_event = { git = "https://github.com/redox-os/event.git" } redox_event = { git = "https://github.com/redox-os/event.git" }
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

View file

@ -6,4 +6,4 @@ version = "0.1.0"
netutils = { git = "https://github.com/redox-os/netutils.git" } netutils = { git = "https://github.com/redox-os/netutils.git" }
rand = "0.3" rand = "0.3"
redox_event = { git = "https://github.com/redox-os/event.git" } redox_event = { git = "https://github.com/redox-os/event.git" }
redox_syscall = { git = "https://github.com/redox-os/syscall.git" } redox_syscall = "0.1"

@ -1 +0,0 @@
Subproject commit 6188e4d040c14d221aebebb942d424edada47671