Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
kylewlacy committed Dec 16, 2024
1 parent b84c818 commit 7a0e4f8
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions crates/brioche-packed-userland-exec/src/linux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ fn run(args: &[&CStr], env_vars: &[&CStr]) -> Result<(), PackedError> {
let program = program.canonicalize()?;
let mut exec = userland_execve::ExecOptions::new(&interpreter);

let interpreter =
<[u8]>::from_path(&interpreter).ok_or(PackedError::InvalidPath)?;
let interpreter = <[u8]>::from_path(&interpreter).ok_or(PackedError::InvalidPath)?;
let interpreter = CString::new(interpreter).map_err(|_| PackedError::InvalidPath)?;

let mut resolved_library_dirs = vec![];
Expand Down Expand Up @@ -109,14 +108,13 @@ fn run(args: &[&CStr], env_vars: &[&CStr]) -> Result<(), PackedError> {
ld_library_path.push(b':');
}

let path =
<[u8]>::from_path(library_dir).ok_or(PackedError::InvalidPath)?;
let path = <[u8]>::from_path(library_dir).ok_or(PackedError::InvalidPath)?;
ld_library_path.extend(path);
}

if let Some(env_library_path) = std::env::var_os("LD_LIBRARY_PATH") {
let env_library_path = <[u8]>::from_os_str(&env_library_path)
.ok_or(PackedError::InvalidPath)?;
let env_library_path =
<[u8]>::from_os_str(&env_library_path).ok_or(PackedError::InvalidPath)?;
if !env_library_path.is_empty() {
ld_library_path.push(b':');
ld_library_path.extend(env_library_path);
Expand Down

0 comments on commit 7a0e4f8

Please sign in to comment.