diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs index 503fe1b7e38259afb6e4ef7d9aa6c16e35254395..149f26543f816fe887439b2b5c30060ee320c5fa 100644 --- a/src/ld_so/linker.rs +++ b/src/ld_so/linker.rs @@ -26,10 +26,10 @@ use crate::{ }; use super::{ + access, debug::{RTLDDebug, RTLDState, _dl_debug_state, _r_debug}, tcb::{Master, Tcb}, PAGE_SIZE, - access, }; #[cfg(target_os = "redox")] diff --git a/src/ld_so/mod.rs b/src/ld_so/mod.rs index 46a7a271a97252ca69c3c81dea51202e080888cc..b39a5e7e269e2c8ffb937ffb113046b591d881e6 100644 --- a/src/ld_so/mod.rs +++ b/src/ld_so/mod.rs @@ -1,11 +1,7 @@ use goblin::elf::program_header::{self, program_header32, program_header64, ProgramHeader}; use self::tcb::{Master, Tcb}; -use crate::{ -start::Stack, -c_str::CStr, -platform::types::* -}; +use crate::{c_str::CStr, platform::types::*, start::Stack}; pub const PAGE_SIZE: usize = 4096; pub mod debug; @@ -85,8 +81,8 @@ pub fn static_init(sp: &'static Stack) { // Wrapper over the systemcall, Do not use outside of ld_so pub unsafe fn access(path: *const c_char, mode: c_int) -> c_int { - let path = CStr::from_ptr(path); - syscall!(ACCESS, (path).as_ptr(), mode) as c_int + let path = CStr::from_ptr(path); + syscall!(ACCESS, (path).as_ptr(), mode) as c_int } #[cfg(target_os = "linux")]