diff options
| -rw-r--r-- | src/main.rs | 9 | ||||
| -rw-r--r-- | src/prompt.rs | 49 | ||||
| -rw-r--r-- | src/user.rs | 49 |
3 files changed, 75 insertions, 32 deletions
diff --git a/src/main.rs b/src/main.rs index 0581b13..403fd33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,10 +7,13 @@ mod prompt; fn main() { match std::fs::read_to_string("/etc/motd") { Ok(motd) => println!("{}", motd), - Err(_) => {}, + Err(_) => {} } - let prompt = prompt::Prompt::new(); + let prompt = match prompt::Prompt::new() { + Ok(p) => p, + Err(e) => panic!(e), + }; let mut cwd = match std::env::current_dir() { Ok(p) => p, Err(e) => panic!(e), @@ -81,7 +84,7 @@ fn main() { if cfg!(debug_assertions) { println!("exit code [{}]", code); } - }, + } None => println!("Process termed by signal"), }, Err(e) => eprintln!("error waiting on final command: {}", e), diff --git a/src/prompt.rs b/src/prompt.rs index e6600b7..40c96cc 100644 --- a/src/prompt.rs +++ b/src/prompt.rs @@ -1,42 +1,33 @@ use std::io::Write; +#[path = "user.rs"] +mod user; + pub struct Prompt { ps1: std::string::String, pub home: std::path::PathBuf, } impl Prompt { - pub fn new() -> Prompt { - let username = match std::process::Command::new("whoami").output() { - Ok(s) => { - let output = std::string::String::from_utf8(s.stdout).unwrap(); - output.trim().to_string() - } - Err(e) => panic!(e), - }; - let hostname = match std::process::Command::new("hostname").output() { - Ok(s) => { - let output = std::string::String::from_utf8(s.stdout).unwrap(); - output.trim().to_string() - } - Err(e) => panic!(e), - }; - let ready = if username == "root" { - "#" - } else { - "$" - }.to_owned(); - - let ps1 = String::from(" {USER}@{HOST} [{PWD}]\n\\$ ") - .replace("{USER}", &username) - .replace("{HOST}", &hostname) - .replace("\\$", &ready); - let home = match std::env::home_dir() { - Some(p) => p, - None => std::path::Path::new("/").to_path_buf(), + pub fn new() -> Result<Prompt, std::io::Error> { + let username = user::username()?; + let hostname = user::hostname()?; + let ready = if username == "root" { "#" } else { "$" }.to_owned(); + + let ps1 = match std::env::var("PS1") { + Ok(val) => val, + Err(_) => String::from(" {USER}@{HOST} [{PWD}]\n{$} "), + } + .replace("{USER}", &username) + .replace("{HOST}", &hostname) + .replace("{$}", &ready); + + let home = match std::env::var("HOME") { + Ok(val) => std::path::Path::new(&val).to_path_buf(), + Err(_) => std::path::Path::new("/").to_path_buf(), }; - Prompt { ps1, home } + Ok(Prompt { ps1, home }) } pub fn print(&self, pwd: &std::path::PathBuf) { diff --git a/src/user.rs b/src/user.rs new file mode 100644 index 0000000..fedf12b --- /dev/null +++ b/src/user.rs @@ -0,0 +1,49 @@ +use std::io::BufRead; + +pub fn hostname() -> std::result::Result<std::string::String, std::io::Error> { + let h = std::fs::read_to_string("/proc/sys/kernel/hostname")?; + Ok(h.trim().to_string()) +} + +#[test] +fn test_hostname() { + let hostname__ = match std::process::Command::new("hostname").output() { + Ok(s) => { + let output = std::string::String::from_utf8(s.stdout).unwrap(); + output.trim().to_string() + } + Err(e) => panic!(e), + }; + + assert_eq!(hostname__, hostname().unwrap()); +} + +pub fn username() -> std::result::Result<std::string::String, std::io::Error> { + let uid = unsafe { libc::getuid().to_string() }; + + let file = std::fs::File::open("/etc/passwd")?; + let reader = std::io::BufReader::new(file); + + for line in reader.lines() { + let l = line?; + let parts: Vec<&str> = l.split(':').collect(); + if uid == parts[2] { + return Ok(parts[0].to_string()); + } + } + + Ok(uid) +} + +#[test] +fn test_username() { + let username__ = match std::process::Command::new("whoami").output() { + Ok(s) => { + let output = std::string::String::from_utf8(s.stdout).unwrap(); + output.trim().to_string() + } + Err(e) => panic!(e), + }; + assert_eq!(username__, username().unwrap()); +} + |