Switch to clap parser

Author: nvinson

.gitignore

@@ -5,3 +5,10 @@ build
 
 /target
 /Cargo.lock
+
+
+# Added by cargo
+#
+# already existing elements were commented out
+
+#/target

Cargo.toml

@@ -17,4 +17,4 @@ name = "efivar"
 path = "src/bin/efivar.rs"
 
 [dependencies]
-clap = { version = "4.1.13", default-features = false, features = ["std"] }
+clap = { version = "4.1.13", default-features = false, features = ["std", "cargo", "help", "wrap_help", "usage"] }

src/bin/efivar.rs

@@ -1,23 +1,120 @@
 extern crate efivar;
-extern crate argparse;
 
-use argparse::{ArgumentParser, StoreTrue, StoreFalse};
+use clap;
+use efivar::{efivar_display, efi_variable_attributes};
+use std::collections::HashSet;
+use std::convert::TryInto;
 use std::process::ExitCode;
 
-fn main() -> ExitCode {
-    let mut verbose = false;
-    let mut parser = ArgumentParser::new();
+#[derive(Eq, Hash, PartialEq)]
+enum ActionType {
+    Append,
+    Export,
+    Import,
+    List,
+    ListGuids,
+    Print,
+    Write
+}
 
-    parser.refer(&mut verbose)
-        .add_option(&["-v", "--verbose"], StoreTrue, "Be verbose")
-        .add_option(&["-q", "--quiet"], StoreFalse, "Be quiet");
+#[derive(Eq, Hash, PartialEq)]
+struct EfivarAction(ActionType);
 
-    match parser.parse_args() {
-        Ok(()) =>  {
-            std::process::ExitCode::from(0)
-        }
-        Err(x) => {
-            std::process::ExitCode::from(x as u8)
-        }
-    }
+fn main() -> ExitCode {
+    let parser = clap::command!()
+        .args_override_self(true)
+        .disable_help_flag(true)
+        .disable_version_flag(true)
+        .max_term_width(90)
+        .term_width(90)
+        .arg(clap::Arg::new("attributes")
+            .short('A')
+            .long("attributes")
+            .help("attributes to use on append")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("list")
+            .short('l')
+            .long("list")
+            .help("list current variables")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("print")
+            .short('p')
+            .long("print")
+            .help("Print variable specified by --name")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("dmpstore")
+            .short('D')
+            .long("dmpstore")
+            .help("use DMPSTORE format when exporting")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("print-decimal")
+            .short('d')
+            .long("print-decimal")
+            .help("print variable in decimal values specified by --name")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("name")
+            .short('n')
+            .long("name")
+            .value_name("guid-name")
+            .help("variable to manipulate, in the form 8be4df61-93ca-11d2-aa0d-00e098032b8c-Boot0000")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("append")
+            .short('a')
+            .long("append")
+            .help("append to variable specified by --name")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("datafile")
+            .short('f')
+            .long("datafile")
+            .value_name("file")
+            .help("load or save variable contents from or to <file>")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("export")
+            .short('e')
+            .long("export")
+            .value_name("file")
+            .help("export variable to <file>")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("import")
+            .short('i')
+            .long("import")
+            .value_name("file")
+            .help("import variable from <file>")
+            .action(clap::ArgAction::Set)
+        )
+        .arg(clap::Arg::new("list-guids")
+            .short('L')
+            .long("list-guids")
+            .help("show internal GUID list")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("write")
+            .short('w')
+            .long("write")
+            .help("Write to variable specified by --name")
+            .action(clap::ArgAction::SetTrue)
+        )
+        .arg(clap::Arg::new("help")
+            .short('?')
+            .long("help")
+            .help("Show this help message")
+            .action(clap::ArgAction::Help)
+        )
+        .arg(clap::Arg::new("usage")
+            .short(None)
+            .long("usage")
+            .help("ignored for compatibility")
+            .action(clap::ArgAction::Help)
+        )
+        .get_matches();
+    return std::process::ExitCode::from(0);
 }

src/lib/efivar/efivar_display.rs

@@ -1,5 +1,5 @@
 use std::fmt;
-use types::{EfiVariable, EfiVariableAttribute};
+use crate::types::{EfiVariable, EfiVariableAttribute};
 
 pub struct Verbose<'a>(pub &'a EfiVariable<'a>);
 pub struct Decimal<'a>(pub &'a EfiVariable<'a>);

src/lib/efivar/mod.rs

@@ -2,7 +2,7 @@ pub mod types;
 pub mod efivar_display;
 
 pub mod efi_variable_attributes {
-    use types::EfiVariableAttribute;
+    use crate::types::EfiVariableAttribute;
 
     pub static NON_VOLATILE:EfiVariableAttribute
         = EfiVariableAttribute::init("Non-Volatile", 0x1);

src/lib/efivar/types/efi_guid.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use std::iter;
 use std::str::FromStr;
 use super::EfiGuidError;
-use types::efi_guid_error;
+use crate::types::efi_guid_error;
 
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
 pub struct EfiGuid {