pgrep, pkill: Extract function for finding all the processes

Requires adding require_handler to Settings.

Author: dezgeg

src/uu/pgrep/src/pgrep.rs

@@ -33,6 +33,7 @@ struct Settings {
     runstates: Option<String>,
     terminal: Option<HashSet<Teletype>>,
     signal: usize,
+    require_handler: bool,
 }
 
 fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
@@ -58,6 +59,7 @@ fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
                 .collect::<HashSet<_>>()
         }),
         signal: parse_signal_value(matches.get_one::<String>("signal").unwrap())?,
+        require_handler: matches.get_flag("require-handler"),
     };
 
     if (!settings.newest
@@ -76,6 +78,24 @@ fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
     Ok(settings)
 }
 
+fn find_matching_pids(settings: &Settings) -> Vec<ProcessInformation> {
+    let mut pids = collect_matched_pids(settings);
+    #[cfg(unix)]
+    if settings.require_handler {
+        pids.retain(|pid| {
+            let mask =
+                u64::from_str_radix(pid.clone().status().get("SigCgt").unwrap(), 16).unwrap();
+            mask & (1 << settings.signal) != 0
+        });
+    }
+    if pids.is_empty() {
+        uucore::error::set_exit_code(1);
+        pids
+    } else {
+        process_flag_o_n(settings, &mut pids)
+    }
+}
+
 /// # Conceptual model of `pgrep`
 ///
 /// At first, `pgrep` command will check the patterns is legal.
@@ -94,23 +114,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let settings = get_match_settings(&matches)?;
 
     // Collect pids
-    let pids = {
-        let mut pids = collect_matched_pids(&settings);
-        #[cfg(unix)]
-        if matches.get_flag("require-handler") {
-            pids.retain(|pid| {
-                let mask =
-                    u64::from_str_radix(pid.clone().status().get("SigCgt").unwrap(), 16).unwrap();
-                mask & (1 << settings.signal) != 0
-            });
-        }
-        if pids.is_empty() {
-            uucore::error::set_exit_code(1);
-            pids
-        } else {
-            process_flag_o_n(&settings, &mut pids)
-        }
-    };
+    let pids = find_matching_pids(&settings);
 
     // Processing output
     let output = if matches.get_flag("count") {

src/uu/pkill/src/pkill.rs

@@ -44,6 +44,7 @@ struct Settings {
     runstates: Option<String>,
     terminal: Option<HashSet<Teletype>>,
     signal: usize,
+    require_handler: bool,
 }
 
 fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
@@ -69,6 +70,7 @@ fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
                 .collect::<HashSet<_>>()
         }),
         signal: parse_signal_value(matches.get_one::<String>("signal").unwrap())?,
+        require_handler: matches.get_flag("require-handler"),
     };
 
     if (!settings.newest
@@ -87,6 +89,24 @@ fn get_match_settings(matches: &ArgMatches) -> UResult<Settings> {
     Ok(settings)
 }
 
+fn find_matching_pids(settings: &Settings) -> Vec<ProcessInformation> {
+    let mut pids = collect_matched_pids(settings);
+    #[cfg(unix)]
+    if settings.require_handler {
+        pids.retain(|pid| {
+            let mask =
+                u64::from_str_radix(pid.clone().status().get("SigCgt").unwrap(), 16).unwrap();
+            mask & (1 << settings.signal) != 0
+        });
+    }
+    if pids.is_empty() {
+        uucore::error::set_exit_code(1);
+        pids
+    } else {
+        process_flag_o_n(settings, &mut pids)
+    }
+}
+
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     #[cfg(unix)]
@@ -114,23 +134,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     };
 
     // Collect pids
-    let pids = {
-        let mut pids = collect_matched_pids(&settings);
-        #[cfg(unix)]
-        if matches.get_flag("require-handler") {
-            pids.retain(|pid| {
-                let mask =
-                    u64::from_str_radix(pid.clone().status().get("SigCgt").unwrap(), 16).unwrap();
-                mask & (1 << settings.signal) != 0
-            });
-        }
-        if pids.is_empty() {
-            uucore::error::set_exit_code(1);
-            pids
-        } else {
-            process_flag_o_n(&settings, &mut pids)
-        }
-    };
+    let pids = find_matching_pids(&settings);
 
     // Send signal
     // TODO: Implement -q