skill: implement no-action

Author: Bluemangoo

src/uu/skill/src/skill.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use clap::{arg, crate_version, value_parser, Arg, Command};
+use clap::{crate_version, Arg, Command};
 #[cfg(unix)]
 use nix::{sys::signal, sys::signal::Signal, unistd::Pid};
 use uu_snice::{
@@ -29,6 +29,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     }
 
     // Case1: Send signal
+    let take_action = !settings.no_action;
     if let Some(targets) = settings.expressions {
         let pids = collect_pids(&targets);
 
@@ -43,7 +44,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         };
 
         #[cfg(unix)]
-        let results = perform_action(&pids, &signal);
+        let results = perform_action(&pids, &signal, take_action);
         #[cfg(not(unix))]
         let results: Vec<Option<ActionResult>> = Vec::new();
 
@@ -54,20 +55,22 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         if settings.verbose {
             let output = construct_verbose_result(&pids, &results).trim().to_owned();
             println!("{output}");
+        } else if !take_action {
+            pids.iter().for_each(|pid| println!("{pid}"));
         }
     }
 
     Ok(())
 }
 
 #[cfg(unix)]
-fn perform_action(pids: &[u32], signal: &Signal) -> Vec<Option<ActionResult>> {
+fn perform_action(pids: &[u32], signal: &Signal, take_action: bool) -> Vec<Option<ActionResult>> {
+    let sig = if take_action { Some(*signal) } else { None };
     pids.iter()
         .map(|pid| {
             {
-                Some(match signal::kill(Pid::from_raw(*pid as i32), *signal) {
+                Some(match signal::kill(Pid::from_raw(*pid as i32), sig) {
                     Ok(_) => ActionResult::Success,
-
                     Err(_) => ActionResult::PermissionDenied,
                 })
             }
@@ -84,23 +87,5 @@ pub fn uu_app() -> Command {
         .infer_long_args(true)
         .arg_required_else_help(true)
         .arg(Arg::new("signal"))
-        .args([
-            // arg!(-f --fast          "fast mode (not implemented)"),
-            // arg!(-i --interactive   "interactive"),
-            arg!(-l --list                  "list all signal names"),
-            arg!(-L --table                 "list all signal names in a nice table"),
-            // arg!(-n --"no-action"   "do not actually kill processes; just print what would happen"),
-            arg!(-v --verbose               "explain what is being done"),
-            // arg!(-w --warnings      "enable warnings (not implemented)"),
-            // Expressions
-            arg!(-c --command   <command>   ...   "expression is a command name"),
-            arg!(-p --pid       <pid>       ...   "expression is a process id number")
-                .value_parser(value_parser!(u32)),
-            arg!(-t --tty       <tty>       ...   "expression is a terminal"),
-            arg!(-u --user      <username>  ...   "expression is a username"),
-            // arg!(--ns <PID>                "match the processes that belong to the same namespace as <pid>"),
-            // arg!(--nslist <ns>             "list which namespaces will be considered for the --ns option.")
-            //     .value_delimiter(',')
-            //     .value_parser(["ipc", "mnt", "net", "pid", "user", "uts"]),
-        ])
+        .args(uu_snice::clap_args())
 }

src/uu/snice/src/process_matcher.rs

@@ -14,6 +14,7 @@ pub struct Settings {
     pub display: Option<SignalDisplay>,
     pub expressions: Option<Vec<SelectedTarget>>,
     pub verbose: bool,
+    pub no_action: bool,
 }
 
 impl Settings {
@@ -30,6 +31,7 @@ impl Settings {
             display,
             expressions: Self::targets(matches),
             verbose: matches.get_flag("verbose"),
+            no_action: matches.get_flag("no-action"),
         })
     }
 

src/uu/snice/src/snice.rs

@@ -3,14 +3,14 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use std::{collections::HashSet, path::PathBuf, str::FromStr};
-
 use crate::priority::Priority;
 pub use action::ActionResult;
 use action::{perform_action, process_snapshot, users, SelectedTarget};
 use clap::{crate_version, Arg, Command};
 use prettytable::{format::consts::FORMAT_CLEAN, row, Table};
+pub use process_matcher::clap_args;
 use process_matcher::*;
+use std::{collections::HashSet, path::PathBuf, str::FromStr};
 use sysinfo::Pid;
 use uu_pgrep::process::ProcessInformation;
 #[cfg(target_family = "unix")]
@@ -92,7 +92,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     }
 
     // Case1: Perform priority
-    let take_action = !matches.get_flag("no-action");
+    let take_action = !settings.no_action;
     if let Some(targets) = settings.expressions {
         let priority_str = matches.get_one::<String>("priority").cloned();