Rearchitect EFI GUID list

Original efivar library embeds a list of EFI GUIDs in its library. This
is considered limiting, so rearchitct the list so it is loaded from a
resource file. This allows the EFI GUID list to be updated without
needed to recompile the library.

Author: nvinson

Cargo.toml

@@ -18,4 +18,5 @@ path = "src/bin/efivar.rs"
 
 [dependencies]
 clap = { version = "4.1.13", default-features = false, features = ["std", "cargo", "help", "wrap_help", "usage"] }
-lazy_static = "1.4.0"
+serde = { version = "1.0.160", default-features = false, features = ["derive", "std"] }
+serde_json = { version = "1.0.96", default-features = false, features = ["std"] }

build.rs

@@ -0,0 +1,25 @@
+use std::env;
+use std::fs;
+use std::path;
+
+fn main() {
+    let prefix = env::var("OUT_DIR").unwrap();
+    let sys_conf_dir = env::var("SYSCONFDIR").unwrap_or("share".to_string());
+
+    let target_dir = path::Path::new(&sys_conf_dir).join("refivar");
+    let target_path = path::Path::new(&target_dir).join("guids.json");
+    let dest_dir = path::Path::new(&prefix).join(&target_dir);
+    let dest_path = path::Path::new(&prefix).join(&target_path);
+    let src_path = path::Path::new(&std::env::current_dir().unwrap())
+        .join("src")
+        .join("lib")
+        .join("efivar")
+        .join("guids.json");
+
+    if !dest_dir.exists() {
+        fs::create_dir_all(&dest_dir).unwrap();
+    }
+    fs::copy(src_path, dest_path).unwrap();
+
+    print!("cargo:rustc-env=GUIDS_LIST_PATH={}", target_path.display());
+}

src/bin/efivar.rs

@@ -1,5 +1,5 @@
 use clap;
-use efivar::{efi_guids, efi_variable_attributes, efivar_display};
+use efivar::efi_guids;
 use std::process::ExitCode;
 
 fn create_parser() -> clap::Command {
@@ -73,10 +73,18 @@ fn create_parser() -> clap::Command {
             .help("import variable from <file>")
             .action(clap::ArgAction::Set)
         )
+        .arg(clap::Arg::new("guids-list-path")
+            .short('g')
+            .long("guids-list-path")
+            .value_name("guids-list-path")
+            .default_value(efi_guids::DEFAULT_GUIDS_LIST_PATH)
+            .help(format!("specify path to GUIDs list file."))
+            .action(clap::ArgAction::Set)
+        )
         .arg(clap::Arg::new("list-guids")
             .short('L')
             .long("list-guids")
-            .help("show internal GUID list")
+            .help("show GUID list")
             .action(clap::ArgAction::SetTrue)
         )
         .arg(clap::Arg::new("write")
@@ -102,14 +110,18 @@ fn create_parser() -> clap::Command {
 fn main() -> ExitCode {
     let matches = create_parser().get_matches();
     if matches.get_flag("list-guids") {
-        for g in efi_guids::EFI_WELL_KNOWN_GUIDS
-            .sort_by_guid()
-            .split_last()
-            .unwrap()
-            .1
-            .iter()
-        {
-            print!("{}", g);
+        let mut guid_list: efi_guids::EfiGuidList = Default::default();
+        guid_list.load(matches.get_one("guids-list-path").unwrap());
+        for g in guid_list.guids(efi_guids::GuidListSortField::Guid) {
+            println!("{}", g);
+        }
+        println!("");
+        for g in guid_list.guids(efi_guids::GuidListSortField::Id) {
+            println!("{}", g);
+        }
+        println!("");
+        for g in guid_list.guids(efi_guids::GuidListSortField::None) {
+            println!("{}", g);
         }
     }
     return std::process::ExitCode::from(0);