From dc77995b578770ad2400ed5db91600dffc26f310 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Tue, 9 Dec 2025 22:22:09 +0100 Subject: [PATCH] redox-rt: Remove unnecessary image_file field from FexecResult::Interp --- redox-rt/src/proc.rs | 2 -- src/platform/redox/exec.rs | 3 --- 2 files changed, 5 deletions(-) diff --git a/redox-rt/src/proc.rs b/redox-rt/src/proc.rs index 17e3975298..f2c1571818 100644 --- a/redox-rt/src/proc.rs +++ b/redox-rt/src/proc.rs @@ -38,7 +38,6 @@ use syscall::{ pub enum FexecResult { Interp { path: Box<[u8]>, - image_file: FdGuardUpper, interp_override: InterpOverride, }, } @@ -135,7 +134,6 @@ pub fn fexec_impl( return Ok(FexecResult::Interp { path: interp.into_boxed_slice(), - image_file, interp_override: InterpOverride { at_entry: header.e_entry as usize, at_phnum: phnum, diff --git a/src/platform/redox/exec.rs b/src/platform/redox/exec.rs index 0fe66ea7df..0960f01a1a 100644 --- a/src/platform/redox/exec.rs +++ b/src/platform/redox/exec.rs @@ -30,7 +30,6 @@ fn fexec_impl( interp_override: Option, ) -> Result { let FexecResult::Interp { - image_file, path, interp_override: new_interp_override, } = redox_rt::proc::fexec_impl( @@ -44,8 +43,6 @@ fn fexec_impl( interp_override, )?; - drop(image_file); - // According to elf(5), PT_INTERP requires that the interpreter path be // null-terminated. Violating this should therefore give the "format error" ENOEXEC. let path_cstr = CStr::from_bytes_with_nul(&path).map_err(|_| Error::new(ENOEXEC))?;