uucore: remove process functions

Author: xtqqczze

Cargo.lock

@@ -21,6 +21,7 @@ path = "src/install.rs"
 clap = { workspace = true }
 filetime = { workspace = true }
 file_diff = { workspace = true }
+rustix = { workspace = true }
 selinux = { workspace = true, optional = true }
 thiserror = { workspace = true }
 uucore = { workspace = true, default-features = true, features = [

fuzz/Cargo.lock

@@ -10,6 +10,7 @@ mod mode;
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use file_diff::diff;
 use filetime::{FileTime, set_file_times};
+use rustix::process::{getegid, geteuid};
 #[cfg(all(feature = "selinux", any(target_os = "linux", target_os = "android")))]
 use selinux::SecurityContext;
 use std::ffi::OsString;
@@ -27,7 +28,6 @@ use uucore::entries::{grp2gid, usr2uid};
 use uucore::error::{FromIo, UError, UResult, UUsageError};
 use uucore::fs::dir_strip_dot_for_creation;
 use uucore::perms::{Verbosity, VerbosityLevel, wrap_chown};
-use uucore::process::{getegid, geteuid};
 #[cfg(unix)]
 use uucore::safe_traversal::{DirFd, SymlinkBehavior, create_dir_all_safe};
 #[cfg(all(feature = "selinux", any(target_os = "linux", target_os = "android")))]
@@ -1165,7 +1165,7 @@ fn needs_copy_for_ownership(to: &Path, to_meta: &fs::Metadata) -> bool {
     use std::os::unix::fs::MetadataExt;
 
     // Check if the destination file's owner differs from the effective user ID
-    if to_meta.uid() != geteuid() {
+    if to_meta.uid() != geteuid().as_raw() {
         return true;
     }
 
@@ -1177,7 +1177,7 @@ fn needs_copy_for_ownership(to: &Path, to_meta: &fs::Metadata) -> bool {
         .parent()
         .and_then(|parent| metadata(parent).ok())
         .filter(|parent_meta| parent_meta.mode() & 0o2000 != 0)
-        .map_or(getegid(), |parent_meta| parent_meta.gid());
+        .map_or(getegid().as_raw(), |parent_meta| parent_meta.gid());
 
     to_meta.gid() != expected_gid
 }

src/uu/install/Cargo.toml

@@ -25,6 +25,9 @@ libc = { workspace = true }
 thiserror = { workspace = true }
 uucore = { workspace = true, features = ["process"] }
 
+[target.'cfg(not(windows))'.dependencies]
+rustix = { workspace = true }
+
 [dev-dependencies]
 tempfile = { workspace = true }
 

src/uu/install/src/install.rs

@@ -11,15 +11,15 @@ mod parser;
 use clap::Command;
 use error::{ParseError, ParseResult};
 use parser::{Operator, Symbol, UnaryOperator, parse};
+#[cfg(not(windows))]
+use rustix::process::{getegid, geteuid};
 use std::ffi::{OsStr, OsString};
 use std::fs;
 #[cfg(unix)]
 use std::os::unix::fs::MetadataExt;
 use uucore::display::Quotable;
 use uucore::error::{UResult, USimpleError};
 use uucore::format_usage;
-#[cfg(not(windows))]
-use uucore::process::{getegid, geteuid};
 
 use uucore::translate;
 
@@ -278,9 +278,9 @@ fn path(path: &OsStr, condition: &PathCondition) -> bool {
     }
 
     let perm = |metadata: Metadata, p: Permission| {
-        if geteuid() == metadata.uid() {
+        if geteuid().as_raw() == metadata.uid() {
             metadata.mode() & ((p as u32) << 6) != 0
-        } else if getegid() == metadata.gid() {
+        } else if getegid().as_raw() == metadata.gid() {
             metadata.mode() & ((p as u32) << 3) != 0
         } else {
             metadata.mode() & (p as u32) != 0
@@ -309,10 +309,10 @@ fn path(path: &OsStr, condition: &PathCondition) -> bool {
         }
         PathCondition::Regular => file_type.is_file(),
         PathCondition::GroupIdFlag => metadata.mode() & S_ISGID != 0,
-        PathCondition::GroupOwns => metadata.gid() == getegid(),
+        PathCondition::GroupOwns => metadata.gid() == getegid().as_raw(),
         PathCondition::SymLink => metadata.file_type().is_symlink(),
         PathCondition::Sticky => metadata.mode() & S_ISVTX != 0,
-        PathCondition::UserOwns => metadata.uid() == geteuid(),
+        PathCondition::UserOwns => metadata.uid() == geteuid().as_raw(),
         PathCondition::Fifo => file_type.is_fifo(),
         PathCondition::Readable => perm(metadata, Permission::Read),
         PathCondition::Socket => file_type.is_socket(),

src/uu/test/Cargo.toml

@@ -31,6 +31,9 @@ windows-sys = { workspace = true, features = [
   "Win32_Foundation",
 ] }
 
+[target.'cfg(unix)'.dependencies]
+rustix = { workspace = true }
+
 [[bin]]
 name = "whoami"
 path = "src/main.rs"

src/uu/test/src/test.rs

@@ -6,10 +6,10 @@
 use std::ffi::OsString;
 use std::io;
 
+use rustix::process::geteuid;
 use uucore::entries::uid2usr;
-use uucore::process::geteuid;
 
 pub fn get_username() -> io::Result<OsString> {
     // uid2usr should arguably return an OsString but currently doesn't
-    uid2usr(geteuid()).map(Into::into)
+    uid2usr(geteuid().as_raw()).map(Into::into)
 }

src/uu/whoami/Cargo.toml

@@ -83,7 +83,7 @@ unsafe extern "C" {
 pub fn get_groups_gnu(arg_id: Option<u32>) -> IOResult<Vec<rustix::process::RawGid>> {
     let groups = rustix::process::getgroups()
         .map(|g| g.into_iter().map(rustix::fs::Gid::as_raw).collect())?;
-    let egid = arg_id.unwrap_or_else(crate::features::process::getegid);
+    let egid = arg_id.unwrap_or_else(|| rustix::process::getegid().as_raw());
     Ok(sort_groups(groups, egid))
 }
 

src/uu/whoami/src/platform/unix.rs

@@ -514,9 +514,15 @@ mod tests {
             PathBuf::from_str(&format!("/proc/{}", current_pid())).unwrap(),
         )
         .unwrap();
-        assert_eq!(pid_entry.uid().unwrap(), crate::process::getuid());
-        assert_eq!(pid_entry.euid().unwrap(), crate::process::geteuid());
-        assert_eq!(pid_entry.gid().unwrap(), crate::process::getgid());
-        assert_eq!(pid_entry.egid().unwrap(), crate::process::getegid());
+        assert_eq!(pid_entry.uid().unwrap(), rustix::process::getuid().as_raw());
+        assert_eq!(
+            pid_entry.euid().unwrap(),
+            rustix::process::geteuid().as_raw()
+        );
+        assert_eq!(pid_entry.gid().unwrap(), rustix::process::getgid().as_raw());
+        assert_eq!(
+            pid_entry.egid().unwrap(),
+            rustix::process::getegid().as_raw()
+        );
     }
 }