mikros/psh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cat builtin

Browse Source
This commit is contained in:
pjht 2024-11-24 07:39:48 -06:00
parent 9002fa3b35
commit e6838b3837
Signed by: pjht
GPG Key ID: CA239FC6934E6F3A
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.rs
View File

@ -4,11 +4,6 @@ use std::{
use clap::Parser; use clap::Parser;
#[derive(Parser, Debug)]
struct Cat {
path: PathBuf,
}
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
struct Cd { struct Cd {
path: PathBuf, path: PathBuf,
@ -42,28 +37,6 @@ fn main() {
}; };
match cmd[0].as_str() { match cmd[0].as_str() {
"pwd" => println!("{}", current_dir().unwrap().to_string_lossy()), "pwd" => println!("{}", current_dir().unwrap().to_string_lossy()),
"cat" => {
let cmd = match Cat::try_parse_from(&cmd) {
Ok(cmd) => cmd,
Err(err) => {
err.print().unwrap();
continue;
}
};
let contents = match std::fs::read(&cmd.path) {
Ok(val) => val,
Err(e) => {
println!("cat: {}: {}", cmd.path.display(), e);
continue;
}
};
io::stdout().lock().write_all(&contents).unwrap();
if let Some(&last_byte) = contents.last() {
if last_byte != b'\n' {
println!("%");
}
}
}
"cd" => { "cd" => {
let cmd = match Cd::try_parse_from(&cmd) { let cmd = match Cd::try_parse_from(&cmd) {
Ok(cmd) => cmd, Ok(cmd) => cmd,
@ -86,7 +59,6 @@ fn main() {
"help" => { "help" => {
println!("Commands:"); println!("Commands:");
println!("pwd"); println!("pwd");
println!("cat");
println!("cd"); println!("cd");
println!("exit"); println!("exit");
println!("help"); println!("help");