Updated CLI Argument Parsing (New)

Cargo.toml

@@ -10,13 +10,13 @@ license = "MIT"
 
 [dependencies]
 glob = { version = "0.3.0", optional = true }
-libc      = "0.2.97"
-cfg-if    = "1.0.0"
+libc = "0.2.97"
+cfg-if = "1.0.0"
 daemonize = "0.4.1"
-argh      = "0.1.5"
+clap = { version = "3.0.0-rc.7", features = ["derive"] }
 
 [build-dependencies]
-cc   = "1.0.68"
+cc = "1.0.68"
 libc = "0.2.97"
 
 [dev-dependencies]

src/cfg.rs

@@ -0,0 +1,23 @@
+use clap::Parser;
+
+#[derive(Parser, Debug)]
+/// Lightweight Process-Killer Daemon for Out-of-Memory Scenarios
+#[clap(author, version, about)]
+pub struct Cli {
+    /// Log extra debugging information
+    #[clap(short, long)]
+    pub verbose: bool,
+    /// Do not fork a daemon process
+    #[clap(short, long)]
+    pub no_daemonize: bool,
+    /// Kill the entire process group of a target
+    #[clap(short, long)]
+    pub kill_pgroup: bool,
+    /// The cieling PSI value; All processes that surpass this will be killed
+    #[clap(short = 'p', long, value_name = "PSI", default_value = "25.0")]
+    pub cutoff_psi: f32,
+    // #[cfg(feature = "glob-ignore")]
+    /// A (tilde-separated) list of glob patterns matching process names which will never be killed
+    #[clap(short = 'u', long = "unkillable", value_name = "GLOB")]
+    pub ignored_globs: Option<Vec<String>>,
+}

src/kill.rs

@@ -8,13 +8,9 @@ use libc::{EINVAL, EPERM, ESRCH, SIGKILL, SIGTERM};
 use crate::errno::errno;
 use crate::error::{Error, Result};
 use crate::process::Process;
-use crate::{cli, utils};
+use crate::{cfg, utils};
 
-pub fn choose_victim(
-    proc_buf: &mut [u8],
-    buf: &mut [u8],
-    args: &cli::CommandLineArgs,
-) -> Result<Process> {
+pub fn choose_victim(proc_buf: &mut [u8], buf: &mut [u8], args: &cfg::Cli) -> Result<Process> {
     let now = Instant::now();
 
     // `args` is currently only used when checking for unkillable patterns

src/main.rs

@@ -1,10 +1,9 @@
-// use uname::Uname;
-
+use clap::Parser;
 use uname::Uname;
 
 use crate::{memory::lock_memory_pages, monitor::Monitor};
 
-mod cli;
+mod cfg;
 mod daemon;
 mod errno;
 mod error;
@@ -17,7 +16,8 @@ mod uname;
 mod utils;
 
 fn main() -> error::Result<()> {
-    let args: cli::CommandLineArgs = argh::from_env();
+    let args = cfg::Cli::parse();
+    println!("{:?}", args);
 
     // Show uname info and return the Linux version running
     let _linux_version = {
@@ -35,7 +35,7 @@ fn main() -> error::Result<()> {
     // Buffer for anything else
     let buf = [0_u8; 100];
 
-    if !args.no_daemon {
+    if !args.no_daemonize {
         // Daemonize current process
         println!("\nStarting daemonization process!");
         daemon::daemonize()?;