From 1ac8c4834b8299298818a1e75ae0068bfce80db8 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 19 Sep 2024 16:09:11 -0600
Subject: [PATCH] Format
---
src/fs.rs | 8 ++++++--
src/header/sys_resource/mod.rs | 2 +-
src/header/unistd/mod.rs | 14 ++++++++++----
src/platform/linux/mod.rs | 18 ++++++++++--------
src/platform/redox/mod.rs | 5 +----
5 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/fs.rs b/src/fs.rs
index f270181aa..db427038f 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 24bed3a24..2437248d3 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 646d350b9..0abbcdad1 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 ad0536bf6..59b860872 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 e50e8f879..534bb9827 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
}
--
GitLab