Move EC tag processing from shell script to Rust program

Author: jackpot51

res/firmware.nsh

@@ -166,23 +166,6 @@ if "%2" == "ec" then
         exit %lasterror%
     endif
 
-    if "%3" == "tag" then
-        if exist ec.tag then
-            rm ec.tag
-            if exist ec.tag then
-                echo "failed to remove ec.tag"
-                exit 1
-            endif
-        else
-            echo > ec.tag
-            if not exist ec.tag then
-                echo "failed to create ec.tag"
-                exit 1
-            endif
-        endif
-        exit 0
-    endif
-
     echo "ec: unknown subcommand '%3'"
     exit 1
 endif

src/app/ec.rs

@@ -1,3 +1,4 @@
+use core::ops::Try;
 use ecflash::{Ec, EcFile, EcFlash};
 use ectool::{
     Firmware,
@@ -8,12 +9,13 @@ use ectool::{
 };
 use std::{
     cell::Cell,
+    ffi::wstr,
     fs::{find, load},
     str,
 };
 use uefi::status::{Error, Result};
 
-use super::{ECROM, EC2ROM, FIRMWAREDIR, FIRMWARENSH, shell, Component};
+use super::{ECROM, EC2ROM, ECTAG, FIRMWAREDIR, FIRMWARENSH, shell, Component};
 
 pub struct UefiTimeout {
     duration: u64,
@@ -385,16 +387,31 @@ impl Component for EcComponent {
         };
 
         if requires_reset {
-            //Create tag file and skip enter when tag file is found
-            let cmd = format!("{} {} ec tag", FIRMWARENSH, FIRMWAREDIR);
-            match shell(&cmd) {
-                Ok(status) => {
-                    if status != 0 {
-                        println!("EC tag exited with error: {}", status);
+            match find(FIRMWAREDIR) {
+                Ok((_, firmware_dir)) => {
+                    //Try to create tag file without running shell
+                    let filename = wstr(ECTAG);
+                    let mut file = 0 as *mut uefi::fs::File;
+                    match (firmware_dir.0.Open)(
+                        firmware_dir.0,
+                        &mut file,
+                        filename.as_ptr(),
+                        uefi::fs::FILE_MODE_CREATE | uefi::fs::FILE_MODE_READ | uefi::fs::FILE_MODE_WRITE,
+                        0
+                    ).into_result() {
+                        Ok(_) => {
+                            unsafe {
+                                let _ = ((*file).Close)(&mut *file);
+                            }
+                            println!("EC tag: created successfully");
+                        },
+                        Err(err) => {
+                            println!("EC tag: failed to create {}: {:?}", ECTAG, err);
+                        }
                     }
                 },
                 Err(err) => {
-                    println!("EC tag error: {:?}", err);
+                    println!("EC tag: failed to find {}: {:?}", FIRMWAREDIR, err);
                 }
             }
 

src/app/mod.rs

@@ -1,4 +1,4 @@
-use core::{char, ptr};
+use core::{char, mem, ptr};
 use core::ops::Try;
 use ecflash::EcFlash;
 use orbclient::{Color, Renderer};
@@ -220,9 +220,19 @@ fn inner() -> Result<()> {
         "* No updates were found *"
     } else {
         let mut setup_menu = false;
-        let c = if find(ECTAG).is_ok() {
+        let c = if let Ok((_, ectag)) = find(ECTAG) {
             // Attempt to remove EC tag
-            let _ = shell(&format!("{} {} ec tag", FIRMWARENSH, FIRMWAREDIR));
+            match (ectag.0.Delete)(ectag.0).into_result() {
+                Ok(_) => {
+                    println!("EC tag: deleted successfully");
+
+                    // Have to prevent Close from being called after Delete
+                    mem::forget(ectag);
+                },
+                Err(err) => {
+                    println!("EC tag: failed to delete: {:?}", err);
+                }
+            }
 
             // Skip enter if system76 ec flashing already occured
             components.clear();