vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with nulld, and migrate to redox-scheme.

Browse Source
This commit is contained in:
4lDO2
2023-11-16 14:11:13 +01:00
parent fbf2109692
commit 31eaa8fe78
4 changed files with 90 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+49 -10
View File
@@ -9,34 +9,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "libc"
version = "0.2.147"
name = "bitflags"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "redox-daemon"
version = "0.1.1"
name = "libc"
version = "0.2.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "811fd0d382a70c9e9192166ee794567b65ef34cc7309c86a49b071779ca9b5f3"
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
[[package]]
name = "libredox"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
dependencies = [
"bitflags 2.4.1",
"libc",
"redox_syscall",
]
[[package]]
name = "redox_syscall"
version = "0.3.5"
name = "libredox"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
checksum = "962b650e6b934f95cec493e1464e0f5cba98dd9ba9ef2b1c42cdfdb7864cab5a"
dependencies = [
"bitflags",
"bitflags 2.4.1",
"libc",
"redox_syscall",
]
[[package]]
name = "redox-daemon"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "353178b5771a301b9d2b318914ab5dfeb21dd6e65930faedde19248cfceca5a7"
dependencies = [
"libc",
"libredox 0.0.1",
]
[[package]]
name = "redox-scheme"
version = "0.1.0"
source = "git+https://gitlab.redox-os.org/redox-os/redox-scheme.git#afd3fa573f0a7c03b762ac23daaf06966afecc75"
dependencies = [
"libredox 0.0.3",
"redox_syscall",
]
[[package]]
name = "redox_syscall"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "zerod"
version = "0.1.0"
dependencies = [
"libredox 0.0.3",
"redox-daemon",
"redox-scheme",
"redox_syscall",
]
Cargo.toml
+4 -2
View File
@@ -5,5 +5,7 @@ authors = ["Alex Lyon <arcterus@mail.com>"]
edition = "2021"
[dependencies]
redox_syscall = "0.3"
redox-daemon = "0.1.1"
redox_syscall = "0.4.1"
redox-scheme = { git = "https://gitlab.redox-os.org/redox-os/redox-scheme.git" }
redox-daemon = "0.1.2"
libredox = "0.0.3"
src/main.rs
+25 -15
View File
@@ -1,31 +1,41 @@
use std::fs::File;
use std::io::{Read, Write};
use syscall::data::Packet;
use syscall::scheme::Scheme;
use redox_scheme::{Socket, SignalBehavior};
use scheme::ZeroScheme;
mod scheme;
fn main() {
redox_daemon::Daemon::new(move |daemon| {
let mut socket = File::create(":zero").expect("zerod: failed to create zero scheme");
let scheme = ZeroScheme;
enum Ty {
Null,
Zero,
}
syscall::setrens(0, 0).expect("zerod: failed to enter null namespace");
fn main() {
let ty = match &*std::env::args().next().unwrap() {
"nulld" => Ty::Null,
"zerod" => Ty::Zero,
_ => panic!("needs to be called as either nulld or zerod"),
};
redox_daemon::Daemon::new(move |daemon| {
let name = match ty {
Ty::Null => "null",
Ty::Zero => "zero",
};
let socket = Socket::create(name).expect("zerod: failed to create zero scheme");
let zero_scheme = ZeroScheme(ty);
libredox::call::setrens(0, 0).expect("zerod: failed to enter null namespace");
daemon.ready().expect("zerod: failed to notify parent");
loop {
let mut packet = Packet::default();
if socket.read(&mut packet).expect("zerod: failed to read events from zero scheme") == 0 {
let Some(request) = socket.next_request(SignalBehavior::Restart).expect("zerod: failed to read events from zero scheme") else {
std::process::exit(0);
}
};
scheme.handle(&mut packet);
let response = request.handle_scheme(&zero_scheme);
socket.write(&packet).expect("zerod: failed to write responses to zero scheme");
socket.write_responses(&[response], SignalBehavior::Restart).expect("zerod: failed to write responses to zero scheme");
}
}).expect("zerod: failed to daemonize");
}
src/scheme.rs
+12 -16
View File
@@ -1,9 +1,9 @@
use syscall::{error::*, MODE_CHR};
use syscall::scheme::Scheme;
use redox_scheme::Scheme;
use std::cmp;
use crate::Ty;
pub struct ZeroScheme;
pub struct ZeroScheme(pub Ty);
impl Scheme for ZeroScheme {
fn open(&self, _path: &str, _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
@@ -11,27 +11,23 @@ impl Scheme for ZeroScheme {
}
fn dup(&self, _file: usize, buf: &[u8]) -> Result<usize> {
if ! buf.is_empty() {
if !buf.is_empty() {
return Err(Error::new(EINVAL));
}
Ok(0)
}
/// Read the file `number` into the `buffer`
///
/// Returns the number of bytes read
fn read(&self, _file: usize, buf: &mut [u8]) -> Result<usize> {
let size = buf.len();
buf[..size].iter_mut().for_each(|val| *val = 0);
Ok(size)
match self.0 {
Ty::Null => Ok(0),
Ty::Zero => {
buf.fill(0);
Ok(buf.len())
}
}
}
/// Write the `buffer` to the `file`
///
/// Returns the number of bytes written
fn write(&self, _file: usize, buffer: &[u8]) -> Result<usize> {
Ok(buffer.len())
}
@@ -42,7 +38,7 @@ impl Scheme for ZeroScheme {
fn fpath(&self, _id: usize, buf: &mut [u8]) -> Result<usize> {
let scheme_path = b"zero:";
let size = cmp::min(buf.len(), scheme_path.len());
let size = std::cmp::min(buf.len(), scheme_path.len());
buf[..size].copy_from_slice(&scheme_path[..size]);