From 4b5a2af7a916910bfeaf46b298a963d8a038565a Mon Sep 17 00:00:00 2001
From: oech3 <79379754+oech3@users.noreply.github.com>
Date: Fri, 1 May 2026 21:52:18 +0900
Subject: [PATCH] nohup: reduce unsafe

---
 Cargo.lock                |  1 +
 src/uu/nohup/Cargo.toml   |  1 +
 src/uu/nohup/src/nohup.rs | 19 +++++++------------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f0a9beb3..effc2fa0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3856,6 +3856,7 @@ dependencies = [
  "clap",
  "fluent",
  "libc",
+ "rustix",
  "thiserror 2.0.18",
  "uucore",
 ]
diff --git a/src/uu/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml
index 06e49ec41..8dd082137 100644
--- a/src/uu/nohup/Cargo.toml
+++ b/src/uu/nohup/Cargo.toml
@@ -22,6 +22,7 @@ doctest = false
 [dependencies]
 clap = { workspace = true }
 libc = { workspace = true }
+rustix = { workspace = true, features = ["process", "stdio"] }
 uucore = { workspace = true, features = ["fs"] }
 thiserror = { workspace = true }
 fluent = { workspace = true }
diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs
index a7a35f81f..6f42fce68 100644
--- a/src/uu/nohup/src/nohup.rs
+++ b/src/uu/nohup/src/nohup.rs
@@ -8,11 +8,10 @@
 compile_error!("nohup is not supported on the target");
 
 use clap::{Arg, ArgAction, Command};
-use libc::{SIG_IGN, SIGHUP, dup2, signal};
+use rustix::stdio::{dup2_stderr, dup2_stdin, dup2_stdout, stdout};
 use std::env;
 use std::fs::{File, OpenOptions};
 use std::io::{Error, ErrorKind, IsTerminal};
-use std::os::unix::prelude::*;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::process;
@@ -76,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     replace_fds()?;
 
-    unsafe { signal(SIGHUP, SIG_IGN) };
+    unsafe { libc::signal(libc::SIGHUP, libc::SIG_IGN) };
 
     if unsafe { !_vprocmgr_detach_from_console(0).is_null() } {
         return Err(NohupError::CannotDetach.into());
@@ -118,22 +117,18 @@ fn replace_fds() -> UResult<()> {
     if std::io::stdin().is_terminal() {
         let new_stdin = File::open(Path::new("/dev/null"))
             .map_err(|e| NohupError::CannotReplace("STDIN", e))?;
-        if unsafe { dup2(new_stdin.as_raw_fd(), 0) } != 0 {
-            return Err(NohupError::CannotReplace("STDIN", Error::last_os_error()).into());
-        }
+        dup2_stdin(&new_stdin).map_err(|e| NohupError::CannotReplace("STDIN", Error::from(e)))?;
     }
 
     if std::io::stdout().is_terminal() {
         let new_stdout = find_stdout()?;
-        let fd = new_stdout.as_raw_fd();
 
-        if unsafe { dup2(fd, 1) } != 1 {
-            return Err(NohupError::CannotReplace("STDOUT", Error::last_os_error()).into());
-        }
+        dup2_stdout(&new_stdout)
+            .map_err(|e| NohupError::CannotReplace("STDOUT", Error::from(e)))?;
     }
 
-    if std::io::stderr().is_terminal() && unsafe { dup2(1, 2) } != 2 {
-        return Err(NohupError::CannotReplace("STDERR", Error::last_os_error()).into());
+    if std::io::stderr().is_terminal() {
+        dup2_stderr(stdout()).map_err(|e| NohupError::CannotReplace("STDERR", Error::from(e)))?;
     }
     Ok(())
 }