Draft: Remove chvt from dependencies

Cargo.toml

@@ -1,6 +1,5 @@
 [workspace]
 members = [
-    "chvt",
 	"lemurs-core",
     "lemurs-tui",
 	"env_container",

chvt/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "chvt"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-nix = "0.23.1"
-libc = "0.2"

chvt/src/lib.rs

@@ -1,111 +0,0 @@
-//! Adapted From https://github.com/jonay2000/chvt-rs
-
-use nix::errno::Errno;
-use nix::fcntl::{self, OFlag};
-use nix::sys::stat::Mode;
-use nix::unistd::close;
-use std::error::Error;
-use std::fmt::{self, Debug, Display, Formatter};
-
-const VT_ACTIVATE: u64 = 0x5606;
-const VT_WAITACTIVE: u64 = 0x5607;
-
-// Request Number to get Keyboard Type
-const KDGKBTYPE: u64 = 0x4B33;
-
-const KB_101: u8 = 0x02;
-const KB_84: u8 = 0x01;
-
-#[derive(Debug)]
-pub enum ChvtError {
-    Activate(i32),
-    WaitActive(i32),
-    Close,
-    OpenConsole,
-    NotAConsole,
-    GetFD,
-}
-
-impl Error for ChvtError {}
-impl Display for ChvtError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        <dyn Debug>::fmt(self, f)
-    }
-}
-
-fn is_a_console(fd: i32) -> bool {
-    let mut arg = 0;
-    if unsafe { libc::ioctl(fd, KDGKBTYPE, &mut arg) } > 0 {
-        return false;
-    }
-
-    (arg == KB_101) || (arg == KB_84)
-}
-
-fn open_a_console(filename: &str) -> Result<i32, ChvtError> {
-    for oflag in [OFlag::O_RDWR, OFlag::O_RDONLY, OFlag::O_WRONLY] {
-        match fcntl::open(filename, oflag, Mode::empty()) {
-            Ok(fd) => {
-                if !is_a_console(fd) {
-                    close(fd).map_err(|_| ChvtError::Close)?;
-                    return Err(ChvtError::NotAConsole);
-                }
-
-                return Ok(fd);
-            }
-            Err(Errno::EACCES) => continue,
-            _ => break,
-        }
-    }
-
-    Err(ChvtError::OpenConsole)
-}
-
-fn get_fd() -> Result<i32, ChvtError> {
-    if let Ok(fd) = open_a_console("/dev/tty") {
-        return Ok(fd);
-    }
-
-    if let Ok(fd) = open_a_console("/dev/tty") {
-        return Ok(fd);
-    }
-
-    if let Ok(fd) = open_a_console("/dev/tty0") {
-        return Ok(fd);
-    }
-
-    if let Ok(fd) = open_a_console("/dev/vc/0") {
-        return Ok(fd);
-    }
-
-    if let Ok(fd) = open_a_console("/dev/console") {
-        return Ok(fd);
-    }
-
-    for fd in 0..3 {
-        if is_a_console(fd) {
-            return Ok(fd);
-        }
-    }
-
-    // If all attempts fail Error
-    Err(ChvtError::GetFD)
-}
-
-pub unsafe fn chvt(ttynum: i32) -> Result<(), ChvtError> {
-    let fd = get_fd()?;
-
-    let activate = unsafe { libc::ioctl(fd, VT_ACTIVATE, ttynum) };
-    if activate > 0 {
-        return Err(ChvtError::Activate(activate));
-    }
-
-    let wait = unsafe { libc::ioctl(fd, VT_WAITACTIVE, ttynum) };
-    if wait > 0 {
-        return Err(ChvtError::WaitActive(wait));
-    }
-
-    close(fd).map_err(|_| ChvtError::Close)?;
-
-    Ok(())
-}

lemurs-tui/Cargo.toml

@@ -16,7 +16,6 @@ readme = "README.md"
 license = "MIT or APACHE"
 
 [dependencies]
-chvt.path = "../chvt"
 lemurs_core = { package = "lemurs", path = "../lemurs-core" }
 
 # UI and TUI interface

lemurs-tui/src/main.rs

@@ -146,10 +146,6 @@ fn main() -> Result<(), Box<dyn Error>> {
 
         // Switch to the proper tty
         info!("Switching to tty {}", config.tty);
-
-        unsafe { chvt::chvt(config.tty.into()) }.unwrap_or_else(|err| {
-            error!("Failed to switch tty {}. Reason: {err}", config.tty);
-        });
     }
 
     // Start application