diff --git a/src/fs.rs b/src/fs.rs index f270181aa5ca33186204e3c95cb50ebbf1ed760e..db427038f72256a531eab57c45980254609fde55 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -26,11 +26,15 @@ impl File { } pub fn open(path: CStr, oflag: c_int) -> Result<Self, Errno> { - Sys::open(path, oflag, 0).map(Self::new).map_err(Errno::sync) + Sys::open(path, oflag, 0) + .map(Self::new) + .map_err(Errno::sync) } pub fn create(path: CStr, oflag: c_int, mode: mode_t) -> Result<Self, Errno> { - Sys::open(path, oflag | O_CREAT, mode).map(Self::new).map_err(Errno::sync) + Sys::open(path, oflag | O_CREAT, mode) + .map(Self::new) + .map_err(Errno::sync) } pub fn sync_all(&self) -> Result<(), Errno> { diff --git a/src/header/sys_resource/mod.rs b/src/header/sys_resource/mod.rs index 24bed3a243665a6780c7aa083dc9dc6e51d4c737..2437248d3d2cab8ad853d7e6d48096ee3e9d6e3f 100644 --- a/src/header/sys_resource/mod.rs +++ b/src/header/sys_resource/mod.rs @@ -92,4 +92,4 @@ pub unsafe extern "C" fn setrlimit(resource: c_int, rlp: *const rlimit) -> c_int #[no_mangle] pub unsafe extern "C" fn getrusage(who: c_int, r_usage: *mut rusage) -> c_int { Sys::getrusage(who, &mut *r_usage) -} \ No newline at end of file +} diff --git a/src/header/unistd/mod.rs b/src/header/unistd/mod.rs index 646d350b9967468d1daaf25764c4e495794b1071..0abbcdad18fe989ee52fe7e54472c5805c5db380 100644 --- a/src/header/unistd/mod.rs +++ b/src/header/unistd/mod.rs @@ -134,12 +134,16 @@ pub unsafe extern "C" fn crypt(key: *const c_char, salt: *const c_char) -> *mut #[no_mangle] pub extern "C" fn daemon(nochdir: c_int, noclose: c_int) -> c_int { if nochdir == 0 { - if Sys::chdir(c_str!("/")) < 0 { return -1; } + if Sys::chdir(c_str!("/")) < 0 { + return -1; + } } if noclose == 0 { let fd = Sys::open(c_str!("/dev/null"), fcntl::O_RDWR, 0).or_minus_one_errno(); - if fd < 0 { return -1; } + if fd < 0 { + return -1; + } if dup2(fd, 0) < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0 { close(fd); return -1; @@ -150,12 +154,14 @@ pub extern "C" fn daemon(nochdir: c_int, noclose: c_int) -> c_int { } match fork() { - 0 => {}, + 0 => {} -1 => return -1, _ => _exit(0), } - if setsid() < 0 { return -1; } + if setsid() < 0 { + return -1; + } 0 } diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs index ad0536bf60e99016436a70bd3f6832091d3c2bad..59b860872f51cc3f42fa2a6be872eb1318856fd5 100644 --- a/src/platform/linux/mod.rs +++ b/src/platform/linux/mod.rs @@ -4,14 +4,16 @@ use core::{arch::asm, mem::offset_of, ptr}; use super::{types::*, Pal, ERRNO}; use crate::{ c_str::CStr, - header::{dirent::dirent, errno::EINVAL, signal::SIGCHLD, sys_stat::S_IFIFO}, -}; -use crate::header::{ - sys_resource::{rlimit, rusage}, - sys_stat::stat, - sys_statvfs::statvfs, - sys_time::{timeval, timezone}, - unistd::SEEK_SET, + header::{ + dirent::dirent, + errno::EINVAL, + signal::SIGCHLD, + sys_resource::{rlimit, rusage}, + sys_stat::{stat, S_IFIFO}, + sys_statvfs::statvfs, + sys_time::{timeval, timezone}, + unistd::SEEK_SET, + }, }; // use header::sys_times::tms; use crate::{ diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index e50e8f8798100a7004c79ae670a3acdc42c0cb2f..534bb98272438b490fae473b441a0898a705bd5b 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -531,10 +531,7 @@ impl Pal for Sys { fn getrusage(who: c_int, r_usage: &mut rusage) -> c_int { //TODO - eprintln!( - "relibc getrusage({}, {:p}): not implemented", - who, r_usage - ); + eprintln!("relibc getrusage({}, {:p}): not implemented", who, r_usage); 0 }