Address PR review comments: add OpenBSD comments and deduplicate utmp setup

Author: ChrisDryden

.github/workflows/CICD.yml

@@ -739,24 +739,7 @@ jobs:
             # selinux and systemd headers needed to build tests
             sudo apt-get -y update
             sudo apt-get -y install libselinux1-dev libsystemd-dev
-            # pinky is a tool to show logged-in users from utmp, and gecos fields from /etc/passwd.
-            # In GitHub Action *nix VMs, no accounts log in, even the "runner" account that runs the commands, and "system boot" entry is missing.
-            # The account also has empty gecos fields.
-            # To work around these issues for pinky (and who) tests, we create a fake utmp file with a
-            # system boot entry and a login entry for the GH runner account.
-            printf '%s\n%s\n%s' \
-              '[2] [00000] [~~  ] [reboot  ] [~           ] [6.0.0-test                      ] [0.0.0.0        ] [2022-02-22T22:11:22,222222+0000]' \
-              '[7] [999999] [tty2] [runner  ] [tty2        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
-              '[7] [00001] [tty3] [runner  ] [tty3        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
-              | sudo utmpdump -r -o /var/run/utmp
-            # ... and add a full name to each account with a gecos field but no full name.
-            sudo sed -i 's/:,/:runner name,/' /etc/passwd
-            # We also create a couple optional files pinky looks for
-            touch /home/runner/.project
-            echo "foo" > /home/runner/.plan
-            # add user with digital username for testing with issue #7787
-            echo 200:x:2000:2000::/home/200:/bin/bash | sudo tee -a /etc/passwd
-            echo 200:x:2000: | sudo tee -a /etc/group
+            bash util/setup-gh-runner-utmp.sh
             ;;
         esac
     - uses: taiki-e/install-action@v2
@@ -1104,24 +1087,7 @@ jobs:
             # selinux and systemd headers needed to build tests
             sudo apt-get -y update
             sudo apt-get -y install libselinux1-dev libsystemd-dev
-            # pinky is a tool to show logged-in users from utmp, and gecos fields from /etc/passwd.
-            # In GitHub Action *nix VMs, no accounts log in, even the "runner" account that runs the commands, and "system boot" entry is missing.
-            # The account also has empty gecos fields.
-            # To work around these issues for pinky (and who) tests, we create a fake utmp file with a
-            # system boot entry and a login entry for the GH runner account.
-            printf '%s\n%s\n%s' \
-              '[2] [00000] [~~  ] [reboot  ] [~           ] [6.0.0-test                      ] [0.0.0.0        ] [2022-02-22T22:11:22,222222+0000]' \
-              '[7] [999999] [tty2] [runner  ] [tty2        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
-              '[7] [00001] [tty3] [runner  ] [tty3        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
-              | sudo utmpdump -r -o /var/run/utmp
-            # ... and add a full name to each account with a gecos field but no full name.
-            sudo sed -i 's/:,/:runner name,/' /etc/passwd
-            # We also create a couple optional files pinky looks for
-            touch /home/runner/.project
-            echo "foo" > /home/runner/.plan
-            # add user with digital username for testing with issue #7787
-            echo 200:x:2000:2000::/home/200:/bin/bash | sudo tee -a /etc/passwd
-            echo 200:x:2000: | sudo tee -a /etc/group
+            bash util/setup-gh-runner-utmp.sh
             ;;
         esac
 

src/uu/users/src/users.rs

@@ -12,8 +12,6 @@ use clap::builder::ValueParser;
 use clap::{Arg, Command};
 use uucore::error::UResult;
 use uucore::format_usage;
-#[cfg(not(target_os = "openbsd"))]
-use uucore::process::pid_is_alive;
 use uucore::translate;
 
 #[cfg(target_os = "openbsd")]
@@ -63,8 +61,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             }
         }
     };
+    // OpenBSD uses the older UTMP format (not UTMPX) which doesn't reliably track PIDs,
+    // so we only filter by pid_is_alive on non-OpenBSD systems.
     #[cfg(not(target_os = "openbsd"))]
     {
+        use uucore::process::pid_is_alive;
         let filename = maybe_file.unwrap_or(utmpx::DEFAULT_FILE.as_ref());
 
         users = Utmpx::iter_all_records_from(filename)

src/uu/who/src/platform/unix.rs

@@ -11,7 +11,6 @@ use crate::uu_app;
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult};
 use uucore::libc::{S_IWGRP, STDIN_FILENO, ttyname};
-#[cfg(not(target_os = "openbsd"))]
 use uucore::process::pid_is_alive;
 use uucore::translate;
 

util/setup-gh-runner-utmp.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# spell-checker:ignore utmpdump gecos
+# pinky is a tool to show logged-in users from utmp, and gecos fields from /etc/passwd.
+# In GitHub Action *nix VMs, no accounts log in, even the "runner" account that runs the commands, and "system boot" entry is missing.
+# The account also has empty gecos fields.
+# To work around these issues for pinky (and who) tests, we create a fake utmp file with a
+# system boot entry and a login entry for the GH runner account.
+printf '%s\n%s\n%s' \
+  '[2] [00000] [~~  ] [reboot  ] [~           ] [6.0.0-test                      ] [0.0.0.0        ] [2022-02-22T22:11:22,222222+0000]' \
+  '[7] [999999] [tty2] [runner  ] [tty2        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
+  '[7] [00001] [tty3] [runner  ] [tty3        ] [                    ] [0.0.0.0        ] [2022-02-22T22:22:22,222222+0000]' \
+  | sudo utmpdump -r -o /var/run/utmp
+# ... and add a full name to each account with a gecos field but no full name.
+sudo sed -i 's/:,/:runner name,/' /etc/passwd
+# We also create a couple optional files pinky looks for
+touch /home/runner/.project
+echo "foo" > /home/runner/.plan
+# add user with digital username for testing with issue #7787
+echo 200:x:2000:2000::/home/200:/bin/bash | sudo tee -a /etc/passwd
+echo 200:x:2000: | sudo tee -a /etc/group