ps: Implement -x flag

Author: dezgeg

src/uu/ps/src/mapping.rs

@@ -104,6 +104,13 @@ pub(crate) fn vm_format_codes() -> Vec<String> {
     .to_vec()
 }
 
+/// Returns the format codes used when BSD flags (e.g. -x) are used.
+pub(crate) fn bsd_format_codes() -> Vec<String> {
+    ["pid", "tname", "stat", "time", "command"]
+        .map(Into::into)
+        .to_vec()
+}
+
 /// Returns the register format codes (for -X flag).
 pub(crate) fn register_format_codes() -> Vec<String> {
     [

src/uu/ps/src/process_selection.rs

@@ -43,6 +43,9 @@ pub struct ProcessSelectionSettings {
     /// - `-d` Select all processes except session leaders.
     pub select_non_session_leaders: bool,
 
+    /// - '-x' Lift "must have a tty" restriction.
+    pub dont_require_tty: bool,
+
     /// - `--deselect` Negates the selection.
     pub negate_selection: bool,
 }
@@ -53,6 +56,7 @@ impl ProcessSelectionSettings {
             select_all: matches.get_flag("A"),
             select_non_session_leaders_with_tty: matches.get_flag("a"),
             select_non_session_leaders: matches.get_flag("d"),
+            dont_require_tty: matches.get_flag("x"),
             negate_selection: matches.get_flag("deselect"),
         }
     }
@@ -75,8 +79,9 @@ impl ProcessSelectionSettings {
                 return Ok(!is_session_leader(process));
             }
 
-            // Default behavior: select processes with same terminal and same effective user ID
-            Ok(process.tty() == current_tty && process.euid().unwrap() == current_euid)
+            // Default behavior: select processes with same effective user ID and same tty (except -x removes tty restriction)
+            Ok(process.euid().unwrap() == current_euid
+                && (self.dont_require_tty || process.tty() == current_tty))
         };
 
         let mut selected = vec![];

src/uu/ps/src/ps.rs

@@ -12,7 +12,7 @@ mod sorting;
 use clap::crate_version;
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use mapping::{
-    collect_code_mapping, default_codes, default_mapping, default_with_psr_codes,
+    bsd_format_codes, collect_code_mapping, default_codes, default_mapping, default_with_psr_codes,
     extra_full_format_codes, full_format_codes, job_format_codes, long_format_codes,
     long_y_format_codes, register_format_codes, signal_format_codes, user_format_codes,
     vm_format_codes,
@@ -65,6 +65,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         user_format_codes()
     } else if matches.get_flag("v") {
         vm_format_codes()
+    } else if matches.get_flag("x") {
+        bsd_format_codes()
     } else if matches.get_flag("X") {
         register_format_codes()
     } else if arg_formats.is_empty() {
@@ -179,11 +181,10 @@ pub fn uu_app() -> Command {
             //     .action(ArgAction::SetTrue)
             //     .help("all processes on this terminal")
             //     .allow_hyphen_values(true),
-            // Arg::new("x")
-            //     .short('x')
-            //     .action(ArgAction::SetTrue)
-            //     .help("processes without controlling ttys")
-            //     .allow_hyphen_values(true),
+            Arg::new("x")
+                .short('x')
+                .action(ArgAction::SetTrue)
+                .help("processes without controlling ttys"),
         ])
         .arg(
             Arg::new("f")

tests/by-util/test_ps.rs

@@ -131,6 +131,12 @@ fn test_register_format() {
     );
 }
 
+#[test]
+#[cfg(target_os = "linux")]
+fn test_x_format() {
+    check_header("-x", &["PID", "TTY", "STAT", "TIME", "COMMAND"]);
+}
+
 #[test]
 #[cfg(target_os = "linux")]
 fn test_code_mapping() {