bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

uefi: process: Fix args

Browse source 
- While working on process env support, I found that args were currently
  broken. Not sure how I missed it in the PR, but well here is the fix.
- Additionally, no point in adding space at the end of args.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
This commit is contained in:
Ayush Singh 2025-01-28 19:10:28 +05:30
parent aa6f5ab18e
commit 9c4fd25f27
No known key found for this signature in database
GPG key ID: 05CEF5C789E55A74
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
library/std/src/sys/pal/uefi/process.rs
View file

@ -460,7 +460,7 @@ mod uefi_command_internal {
helpers::open_protocol(self.handle, loaded_image::PROTOCOL_GUID).unwrap();
let len = args.len();
let args_size: u32 = crate::mem::size_of_val(&args).try_into().unwrap();
let args_size: u32 = (len * crate::mem::size_of::<u16>()).try_into().unwrap();
let ptr = Box::into_raw(args).as_mut_ptr();
unsafe {
@ -706,9 +706,10 @@ mod uefi_command_internal {
res.push(QUOTE);
res.extend(prog.encode_wide());
res.push(QUOTE);
res.push(SPACE);
for arg in args {
res.push(SPACE);
// Wrap the argument in quotes to be treat as single arg
res.push(QUOTE);
for c in arg.encode_wide() {
@ -719,8 +720,6 @@ mod uefi_command_internal {
res.push(c);
}
res.push(QUOTE);
res.push(SPACE);
}
res.into_boxed_slice()