Unrolled build for #151014

rust-timer · web-flow · commit c1c5bef36c15 · 2026-04-27T07:56:00.000+02:00
Rollup merge of #151014 - Ayush1325:uefi-cmd-path, r=jhpratt,nicholasbishop std: sys: process: uefi: Add program searching - Follow UEFI Shell search flow to search for programs while launching. - Tested using OVMF on QEMU. @rustbot label +O-UEFI
diff --git a/library/std/src/sys/process/uefi.rs b/library/std/src/sys/process/uefi.rs
@@ -5,7 +5,7 @@ use crate::collections::BTreeMap;
 pub use crate::ffi::OsString as EnvKey;
 use crate::ffi::{OsStr, OsString};
 use crate::num::{NonZero, NonZeroI32};
-use crate::path::Path;
+use crate::path::{Path, PathBuf};
 use crate::process::StdioPipes;
 use crate::sys::fs::File;
 use crate::sys::io::error_string;
@@ -138,7 +138,9 @@ impl Command {
 }
 
 pub fn output(command: &mut Command) -> io::Result<(ExitStatus, Vec<u8>, Vec<u8>)> {
-    let mut cmd = uefi_command_internal::Image::load_image(&command.prog)?;
+    let prog_path = resolve_program(&command.prog)
+        .ok_or(io::const_error!(io::ErrorKind::NotFound, "could not find the program."))?;
+    let mut cmd = uefi_command_internal::Image::load_image(prog_path.as_os_str())?;
 
     // UEFI adds the bin name by default
     if !command.args.is_empty() {
@@ -366,6 +368,36 @@ pub fn read_output(
     match out.diverge() {}
 }
 
+// Search for programs similar to UEFI Shell defined in Section 3.6.1. It follows the following flow:
+// 1. If program is already absolute path, just check if it exists.
+// 2. For non-absolute path, search relative to current directory.
+// 3. Search the path list sequentially.
+//
+// [UEFI Shell Specification](https://uefi.org/sites/default/files/resources/UEFI_Shell_2_2.pdf).
+fn resolve_program<S: AsRef<OsStr> + ?Sized>(prog: &S) -> Option<PathBuf> {
+    let absolute_prog_path = crate::path::absolute(prog.as_ref()).ok()?;
+
+    match crate::fs::exists(&absolute_prog_path) {
+        Ok(true) => return Some(absolute_prog_path),
+        // If program path was already absolute and is not found, then stop.
+        Ok(false) if Path::new(prog.as_ref()).is_absolute() => return None,
+        _ => {}
+    }
+
+    // Search for the program in path.
+    if let Ok(path_var) = crate::env::var("path") {
+        for p in crate::env::split_paths(&path_var) {
+            let temp = p.join(prog.as_ref());
+
+            if let Ok(true) = crate::fs::exists(&temp) {
+                return Some(temp);
+            }
+        }
+    }
+
+    None
+}
+
 #[allow(dead_code)]
 mod uefi_command_internal {
     use r_efi::protocols::{loaded_image, simple_text_input, simple_text_output};
