From 308f6a3d136528485fc068ccfef55767a27988c0 Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Thu, 28 Dec 2023 10:40:13 +0200 Subject: [PATCH] alnyan/yggdrasil: WIP remove start_terminal_session() temporarily --- Cargo.lock | 1 + library/std/src/os/yggdrasil/io/mod.rs | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff8342feb82..f553cfd180a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7182,6 +7182,7 @@ dependencies = [ name = "yggdrasil-rt" version = "0.1.0" dependencies = [ + "cc", "compiler_builtins", "rustc-std-workspace-alloc", "rustc-std-workspace-core", diff --git a/library/std/src/os/yggdrasil/io/mod.rs b/library/std/src/os/yggdrasil/io/mod.rs index ec88d68b758..56d20658842 100644 --- a/library/std/src/os/yggdrasil/io/mod.rs +++ b/library/std/src/os/yggdrasil/io/mod.rs @@ -12,7 +12,7 @@ use crate::mem::MaybeUninit; use crate::path::Path; use crate::sys::cvt_io; use yggdrasil_rt::{ - io::{FileMode, OpenOptions}, + // io::{FileMode, OpenOptions}, sys as syscall, }; @@ -125,18 +125,19 @@ pub unsafe fn get_terminal_options(fd: F) -> crate::io::Result< } #[unstable(feature = "yggdrasil_os", issue = "none")] -pub unsafe fn start_terminal_session>(terminal: P) -> crate::io::Result<()> { - let terminal = terminal.as_ref().to_str().unwrap(); +pub unsafe fn start_terminal_session>(_terminal: P) -> crate::io::Result<()> { + todo!() + // let terminal = terminal.as_ref().to_str().unwrap(); - cvt_io(syscall::start_session())?; + // cvt_io(syscall::start_session())?; - // TODO implement open flags to explicitly set stdin/stdout/stderr + // // TODO implement open flags to explicitly set stdin/stdout/stderr - cvt_io(syscall::open(None, terminal, OpenOptions::READ, FileMode::empty()))?; - cvt_io(syscall::open(None, terminal, OpenOptions::WRITE, FileMode::empty()))?; - cvt_io(syscall::open(None, terminal, OpenOptions::WRITE, FileMode::empty()))?; + // cvt_io(syscall::open(None, terminal, OpenOptions::READ, FileMode::empty()))?; + // cvt_io(syscall::open(None, terminal, OpenOptions::WRITE, FileMode::empty()))?; + // cvt_io(syscall::open(None, terminal, OpenOptions::WRITE, FileMode::empty()))?; - Ok(()) + // Ok(()) } #[unstable(feature = "yggdrasil_os", issue = "none")]