Add environment to SpawnOptions

This commit is contained in:
Mark Poliakov 2023-11-14 15:25:40 +02:00
parent 8bff432534
commit ab13d0fec7
5 changed files with 147 additions and 1 deletions

View File

@ -1,3 +1,5 @@
use core::fmt;
use crate::{bitflags, primitive_enum};
bitflags! {
@ -121,6 +123,35 @@ impl From<u64> for SeekFrom {
}
}
impl fmt::Display for FileMode {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
macro_rules! print_bit {
($res:expr, $val:expr, $self:expr, $bit:expr) => {
if $self.contains($bit) {
$res = $val;
}
};
}
let mut buf = ['-'; 9];
print_bit!(buf[0], 'r', self, Self::USER_READ);
print_bit!(buf[1], 'w', self, Self::USER_WRITE);
print_bit!(buf[2], 'x', self, Self::USER_EXEC);
print_bit!(buf[3], 'r', self, Self::GROUP_READ);
print_bit!(buf[4], 'w', self, Self::GROUP_WRITE);
print_bit!(buf[5], 'x', self, Self::GROUP_EXEC);
print_bit!(buf[6], 'r', self, Self::OTHER_READ);
print_bit!(buf[7], 'w', self, Self::OTHER_WRITE);
print_bit!(buf[8], 'x', self, Self::OTHER_EXEC);
for ch in buf.iter() {
fmt::Display::fmt(ch, f)?;
}
Ok(())
}
}
#[cfg(test)]
mod tests {
use crate::io::SeekFrom;

View File

@ -77,6 +77,13 @@ impl TerminalControlCharacters {
}
}
impl TerminalLineOptions {
/// Returns the line options used for raw tty input
pub const fn raw_input() -> Self {
Self::empty()
}
}
impl TerminalOptions {
/// const-version of [Default] trait impl
pub const fn const_default() -> Self {
@ -88,6 +95,14 @@ impl TerminalOptions {
}
}
/// Returns terminal options configured for raw tty input
pub const fn raw_input() -> Self {
Self {
line: TerminalLineOptions::raw_input(),
..Self::const_default()
}
}
/// Returns `true` if CANONICAL flag is set for this terminal
pub const fn is_canonical(&self) -> bool {
self.line.contains(TerminalLineOptions::CANONICAL)

View File

@ -1,7 +1,7 @@
//! Yggdrasil OS user-kernel communication ABI
#![no_std]
#![feature(trace_macros, const_trait_impl)]
#![deny(missing_docs)]
// #![deny(missing_docs)]
pub(crate) mod macros;
@ -10,4 +10,5 @@ pub mod error;
pub mod io;
pub mod path;
pub mod process;
pub mod serde;
pub mod syscall;

View File

@ -58,6 +58,8 @@ pub struct SpawnOptions<'a> {
pub program: &'a str,
/// Arguments to the child process
pub arguments: &'a [&'a str],
/// Environment for the child process
pub environment: &'a [&'a str],
/// Optional arguments to specify details of the creation
pub optional: &'a [SpawnOption],
}

97
src/serde.rs Normal file
View File

@ -0,0 +1,97 @@
use core::ops::DerefMut;
use crate::error::Error;
pub trait SerializeBuffer {
fn write_bytes(&mut self, data: &[u8]) -> Result<(), Error>;
}
pub trait DeserializeBuffer {
fn read_bytes(&mut self, data: &mut [u8]) -> Result<(), Error>;
}
pub unsafe trait Serialize {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error>;
}
pub trait Deserialize: Sized {
unsafe fn deserialize<B: DeserializeBuffer>(source: &mut B) -> Result<Self, Error>;
}
pub struct SliceSerializeBuffer<T: DerefMut<Target = [u8]>> {
data: T,
}
impl<T: DerefMut<Target = [u8]>> SliceSerializeBuffer<T> {
pub fn new(data: T) -> Self {
Self { data }
}
}
impl<T: DerefMut<Target = [u8]>> SerializeBuffer for SliceSerializeBuffer<T> {
fn write_bytes(&mut self, data: &[u8]) -> Result<(), Error> {
if data.len() > self.data.len() {
return Err(Error::InvalidArgument);
}
todo!()
}
}
macro_rules! int_serde_impl {
($ty:ty) => {
unsafe impl Serialize for $ty {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error> {
target.write_bytes(&self.to_ne_bytes())
}
}
impl Deserialize for $ty {
unsafe fn deserialize<B: DeserializeBuffer>(source: &mut B) -> Result<Self, Error> {
let mut bytes = [0; core::mem::size_of::<Self>()];
source.read_bytes(&mut bytes)?;
Ok(Self::from_ne_bytes(bytes))
}
}
};
}
int_serde_impl!(usize);
int_serde_impl!(u64);
int_serde_impl!(u32);
int_serde_impl!(u16);
unsafe impl Serialize for u8 {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error> {
target.write_bytes(&[*self])
}
}
impl Deserialize for u8 {
unsafe fn deserialize<B: DeserializeBuffer>(source: &mut B) -> Result<Self, Error> {
let mut buffer = [0; 1];
source.read_bytes(&mut buffer)?;
Ok(buffer[0])
}
}
unsafe impl<T: Serialize> Serialize for [T] {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error> {
self.len().serialize(target)?;
for item in self.iter() {
item.serialize(target)?;
}
Ok(())
}
}
unsafe impl Serialize for str {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error> {
self.as_bytes().serialize(target)
}
}
unsafe impl<T: Serialize + ?Sized> Serialize for &T {
fn serialize<B: SerializeBuffer>(&self, target: &mut B) -> Result<(), Error> {
(*self).serialize(target)
}
}