process: Make current_process_info public

pidof will utilize it.

Author: dezgeg

src/uu/pgrep/src/process.rs

@@ -250,6 +250,13 @@ impl ProcessInformation {
         })
     }
 
+    pub fn current_process_info() -> Result<ProcessInformation, io::Error> {
+        use std::str::FromStr;
+        use uucore::process::getpid;
+
+        ProcessInformation::try_new(PathBuf::from_str(&format!("/proc/{}", getpid())).unwrap())
+    }
+
     pub fn proc_status(&self) -> &str {
         &self.inner_status
     }
@@ -495,7 +502,9 @@ pub fn walk_threads() -> impl Iterator<Item = ProcessInformation> {
 mod tests {
     use super::*;
     #[cfg(target_os = "linux")]
-    use std::{collections::HashSet, str::FromStr};
+    use std::collections::HashSet;
+    #[cfg(target_os = "linux")]
+    use uucore::process::getpid;
 
     #[test]
     fn test_run_state_conversion() {
@@ -515,41 +524,19 @@ mod tests {
         assert!(RunState::try_from("Rg").is_err());
     }
 
-    #[cfg(target_os = "linux")]
-    fn current_pid() -> usize {
-        // Direct read link of /proc/self.
-        // It's result must be current programs pid.
-        fs::read_link("/proc/self")
-            .unwrap()
-            .to_str()
-            .unwrap()
-            .parse::<usize>()
-            .unwrap()
-    }
-
-    #[cfg(target_os = "linux")]
-    fn current_process_info() -> ProcessInformation {
-        ProcessInformation::try_new(PathBuf::from_str(&format!("/proc/{}", current_pid())).unwrap())
-            .unwrap()
-    }
-
     #[test]
     #[cfg(target_os = "linux")]
     fn test_walk_pid() {
-        let current_pid = current_pid();
-
-        let find = walk_process().find(|it| it.pid == current_pid);
+        let find = walk_process().find(|it| it.pid == getpid() as usize);
 
         assert!(find.is_some());
     }
 
     #[test]
     #[cfg(target_os = "linux")]
     fn test_pid_entry() {
-        let current_pid = current_pid();
-
-        let pid_entry = current_process_info();
-        let mut result = WalkDir::new(format!("/proc/{}/fd", current_pid))
+        let pid_entry = ProcessInformation::current_process_info().unwrap();
+        let mut result = WalkDir::new(format!("/proc/{}/fd", getpid()))
             .into_iter()
             .flatten()
             .map(DirEntry::into_path)
@@ -569,7 +556,7 @@ mod tests {
     fn test_thread_ids() {
         let main_tid = unsafe { uucore::libc::gettid() };
         std::thread::spawn(move || {
-            let mut pid_entry = current_process_info();
+            let mut pid_entry = ProcessInformation::current_process_info().unwrap();
             let thread_ids = pid_entry.thread_ids();
 
             assert!(thread_ids.contains(&(main_tid as usize)));
@@ -599,7 +586,7 @@ mod tests {
     #[test]
     #[cfg(target_os = "linux")]
     fn test_ids() {
-        let mut pid_entry = current_process_info();
+        let mut pid_entry = ProcessInformation::current_process_info().unwrap();
         assert_eq!(
             pid_entry.ppid().unwrap(),
             unsafe { uucore::libc::getppid() } as u64
@@ -615,7 +602,7 @@ mod tests {
     #[test]
     #[cfg(target_os = "linux")]
     fn test_uid_gid() {
-        let mut pid_entry = current_process_info();
+        let mut pid_entry = ProcessInformation::current_process_info().unwrap();
         assert_eq!(pid_entry.uid().unwrap(), uucore::process::getuid());
         assert_eq!(pid_entry.euid().unwrap(), uucore::process::geteuid());
         assert_eq!(pid_entry.gid().unwrap(), uucore::process::getgid());

src/uu/pidof/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["command-line-utilities"]
 
 
 [dependencies]
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["process"] }
 clap = { workspace = true }
 uu_pgrep = { path = "../pgrep" }