From 4fbf68563af80305ce66ccee72386a759979491e Mon Sep 17 00:00:00 2001 From: Zynh0722 Date: Wed, 31 Jan 2024 16:29:38 -0800 Subject: [PATCH] refactor arg handling --- src/main.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index a03ddfc..53ed57d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,16 +25,21 @@ fn become_wm(conn: &C, screen: &Screen) -> anyhow::Result<()> { res.map_err(|e| anyhow!(e)) } -fn main() -> anyhow::Result<()> { +fn handle_args() { let mut args = std::env::args().skip(1); if let Some(arg) = args.next() { if arg != "-v" { - return Err(anyhow!("usage: rswm [-v]")); + eprintln!("usage: rswm [-v]"); + exit(1); } else { println!("rswm-{}", env!("CARGO_PKG_VERSION")); - return Ok(()); + exit(0); } } +} + +fn main() -> anyhow::Result<()> { + handle_args(); // TODO: Investigate LC_CTYPE and Locale stuff from dwm