From 979dffac17cbd5df6b6a75198a52956f9961955d Mon Sep 17 00:00:00 2001 From: _ <_@_> Date: Fri, 21 Mar 2025 01:10:10 -0500 Subject: [PATCH] in-process cat impl --- Cargo.lock | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 3 + src/main.rs | 63 ++++++++++++------ 3 files changed, 227 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da7dcb8..7067b2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,9 +8,191 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + +[[package]] +name = "linux-raw-sys" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" + [[package]] name = "look_at_that" version = "0.1.0" dependencies = [ "anyhow", + "tempfile", +] + +[[package]] +name = "once_cell" +version = "1.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rustix" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "tempfile" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +dependencies = [ + "fastrand", + "getrandom", + "once_cell", + "rustix", + "windows-sys", +] + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", ] diff --git a/Cargo.toml b/Cargo.toml index ae346a4..54f937a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,9 @@ path = "src/main.rs" [dependencies] anyhow = { version = "1.0.97" } +[dev-dependencies] +tempfile = "3.19.1" + [profile.release] codegen-units = 1 lto = true diff --git a/src/main.rs b/src/main.rs index be02af0..6ea8553 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,20 +1,8 @@ use anyhow::{Context as _, Result, bail}; +use std::{fs, io::{Read as _, Write as _}}; fn main() -> Result<()> { - use std::io::IsTerminal as _; - - let is_terminal = std::io::stdout().is_terminal(); - let mut args = std::env::args(); - let _exe_name = args.next().context("How do we not have an exe name?")?; - let mut filenames = vec![]; - for arg in args { - filenames.push(arg); - } - - let app = App { - filenames, - is_terminal, - }; + let app = App::try_new()?; app.run() } @@ -24,12 +12,29 @@ struct App { } impl App { + fn try_new() -> Result { + use std::io::IsTerminal as _; + + let is_terminal = std::io::stdout().is_terminal(); + let mut args = std::env::args(); + let _exe_name = args.next().context("How do we not have an exe name?")?; + let mut filenames = vec![]; + for arg in args { + filenames.push(arg); + } + + Ok(App { + filenames, + is_terminal, + }) + } + fn run(&self) -> Result<()> { if self.filenames.is_empty() { return self.ls("."); } for filename in &self.filenames { - let metadata = std::fs::metadata(&filename)?; + let metadata = fs::metadata(&filename)?; if metadata.is_dir() { self.ls(filename)?; } else { @@ -40,13 +45,16 @@ impl App { } fn cat(&self, filename: &str) -> Result<()> { - // Use `/usr/bin` just in case for some weird reason we're symlinked as cat, - // we don't want to recurse into ourselves - let status = std::process::Command::new("/usr/bin/cat").arg(filename).status()?; - if !status.success() { - bail!("subprocess `cat` failed"); + let mut f = fs::File::open(filename)?; + let mut buf = vec![0u8; 4_096]; + loop { + let bytes_read = f.read(&mut buf)?; + let buf = &buf[0..bytes_read]; + if bytes_read == 0 { + break Ok(()); + } + std::io::stdout().write_all(buf)?; } - Ok(()) } fn ls(&self, filename: &str) -> Result<()> { @@ -63,3 +71,16 @@ impl App { Ok(()) } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test() -> Result<()> { + let dir = tempfile::tempdir()?; + + + Ok(()) + } +}