Switch from from rustix to xenia

Author: morr0ne

Cargo.lock

@@ -16,14 +16,12 @@ inherits = "release"
 strip = false
 
 [dependencies]
-acumen = "0.0.3"
 bitflags = "2.9.1"
 itoa = "1.0.15"
-rustix = { version = "1.0.8", features = [
-    "process",
-    "system",
-    "termios",
-    "fs",
-    "stdio",
-] }
 sap = "0.0.5"
+xenia = "0.0.4"
+xenia-utils = "0.0.1"
+
+[patch.crates-io]
+# xenia = { path = "../../xenia" }
+# xenia-utils = { path = "../../xenia/utils" }

Cargo.toml

@@ -1,7 +1,6 @@
 use std::{io::stdout, process::exit};
 
 use puppyutils::{Result, cli_with_args};
-use rustix::process::EXIT_FAILURE;
 use sap::Parser;
 
 pub fn main() -> Result {
@@ -14,5 +13,5 @@ pub fn main() -> Result {
         cli_with_args!(args_parser, "false", stdout, #ignore);
     }
 
-    exit(EXIT_FAILURE);
+    exit(1);
 }

src/bin/false.rs

@@ -1,11 +1,15 @@
+#![allow(unused)]
+
 mod options;
 mod settings;
 
 use puppyutils::Result;
-use rustix::{
-    fs::{Dir, Mode, OFlags, open},
-    termios::tcgetwinsize,
-};
+use xenia::stdio::stderr;
+use xenia_utils::termios::{Winsize, tcgetwinsize};
+// use rustix::{
+//     fs::{Dir, Mode, OFlags, open},
+//     termios::tcgetwinsize,
+// };
 use std::io::{self, BufWriter, stdout};
 
 const CURRENT_DIR_PATH: &str = ".";
@@ -15,21 +19,25 @@ pub fn main() -> Result {
     let winsize = get_win_size();
     let _cfg = settings::parse_arguments(winsize.ws_col, &mut stdout)?;
 
-    let fd = open(
-        CURRENT_DIR_PATH,
-        OFlags::DIRECTORY | OFlags::RDONLY,
-        Mode::RUSR,
-    )?;
+    // FIXME: re-implement using xenia
+
+    // let fd = open(
+    //     CURRENT_DIR_PATH,
+    //     OFlags::DIRECTORY | OFlags::RDONLY,
+    //     Mode::RUSR,
+    // )?;
+
+    // let dir = Dir::new(fd)?;
 
-    let dir = Dir::new(fd)?;
+    // // bad bad bad
+    // // FIXME: do not allocate
+    // let names = dir
+    //     .filter_map(Result::ok)
+    //     .map(|entry| entry.file_name().to_string_lossy().into_owned())
+    //     .filter(|entry| !entry.starts_with('.'))
+    //     .collect::<Vec<_>>();
 
-    // bad bad bad
-    // FIXME: do not allocate
-    let names = dir
-        .filter_map(Result::ok)
-        .map(|entry| entry.file_name().to_string_lossy().into_owned())
-        .filter(|entry| !entry.starts_with('.'))
-        .collect::<Vec<_>>();
+    let names = Vec::new();
 
     let mut stdout = BufWriter::new(stdout);
 
@@ -38,8 +46,8 @@ pub fn main() -> Result {
     Ok(())
 }
 
-fn get_win_size() -> rustix::termios::Winsize {
-    let stderr_fd = rustix::stdio::stderr();
+fn get_win_size() -> Winsize {
+    let stderr_fd = stderr();
     tcgetwinsize(stderr_fd).expect("couldn't get terminal size")
 }
 
@@ -49,7 +57,7 @@ fn print_all<O: io::Write>(cols: Vec<String>, stdout: &mut O) -> Result {
     const MIN_COLUMN_WIDTH: u16 = 3;
 
     let len = cols.len();
-    let stderr_fd = rustix::stdio::stderr();
+    let stderr_fd = stderr();
     let winsize = tcgetwinsize(stderr_fd).expect("couldn't get terminal size");
 
     let max_idx = ((winsize.ws_col / 3) / MIN_COLUMN_WIDTH - 1) as usize;

src/bin/ls/main.rs

@@ -1,7 +1,7 @@
 use std::io::stdout;
 
 use puppyutils::{Result, cli, get_umask};
-use rustix::fs::{Mode, mkdir};
+use xenia::{Mode, mkdir};
 
 pub fn main() -> Result {
     let mut stdout = stdout();
@@ -15,7 +15,7 @@ pub fn main() -> Result {
         }
     };
 
-    let mode = Mode::from_raw_mode(0o777) & !get_umask();
+    let mode = Mode::from_bits_retain(0o777) & !get_umask();
 
     for dir in dirs {
         mkdir(dir, mode)?;

src/bin/mkdir.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use puppyutils::{Result, cli};
-use rustix::{fs::stat, process::getcwd};
+use xenia::{getcwd, stat};
 
 pub fn main() -> Result {
     let mut stdout = stdout();

src/bin/pwd.rs

@@ -4,10 +4,7 @@ use std::{
 };
 
 use puppyutils::{Result, cli};
-use rustix::{
-    process::{EXIT_FAILURE, EXIT_SUCCESS},
-    termios::{isatty, ttyname},
-};
+use xenia_utils::termios::{isatty, ttyname};
 
 pub fn main() -> Result {
     let mut stdout = stdout();
@@ -23,11 +20,7 @@ pub fn main() -> Result {
     let is_tty = isatty(&stdin);
 
     if quiet {
-        if is_tty {
-            exit(EXIT_SUCCESS)
-        } else {
-            exit(EXIT_FAILURE)
-        }
+        if is_tty { exit(0) } else { exit(1) }
     }
 
     if is_tty {

src/bin/tty.rs

@@ -1,7 +1,7 @@
 use std::io::{Write, stdout};
 
 use puppyutils::{Result, cli};
-use rustix::system::uname;
+use xenia::uname;
 
 bitflags::bitflags! {
     #[rustfmt::skip]

src/bin/uname.rs

@@ -1,8 +1,8 @@
 use std::io::{Write, stderr, stdout};
 
-use acumen::getpwuid;
 use puppyutils::{Result, cli};
-use rustix::process::geteuid;
+use xenia::geteuid;
+use xenia_utils::passwd::Passwd;
 
 const CANNOT_FIND_UID: &[u8] = b"cannot find name for user ID: ";
 
@@ -13,20 +13,26 @@ pub fn main() -> Result {
 
     let uid = geteuid();
 
-    if let Some(passwd) = getpwuid(geteuid()) {
-        stdout.write_all(passwd.name.as_bytes())?;
-        stdout.write_all(b"\n")?;
+    let mut parser = Passwd::entries()?;
 
-        stdout.flush()?;
-    } else {
-        let mut stderr = stderr();
+    while let Ok(Some(entry)) = parser.next_entry() {
+        if entry.uid == uid {
+            stdout.write_all(entry.name.as_bytes())?;
+            stdout.write_all(b"\n")?;
 
-        stderr.write_all(CANNOT_FIND_UID)?;
-        stderr.write_all(itoa::Buffer::new().format(uid.as_raw()).as_bytes())?;
-        stderr.write_all(b"\n")?;
+            stdout.flush()?;
 
-        stderr.flush()?;
+            return Ok(());
+        }
     }
 
+    let mut stderr = stderr();
+
+    stderr.write_all(CANNOT_FIND_UID)?;
+    stderr.write_all(itoa::Buffer::new().format(uid.as_raw()).as_bytes())?;
+    stderr.write_all(b"\n")?;
+
+    stderr.flush()?;
+
     Ok(())
 }