From 3b6b7fdad419ab6e94f8e1b92e342f48e939e3ab Mon Sep 17 00:00:00 2001
From: Bluemangoo <chenfy2006@qq.com>
Date: Wed, 2 Apr 2025 16:27:37 +0000
Subject: [PATCH 1/2] w: add uptime header

---
 src/uu/w/Cargo.toml     |  2 +-
 src/uu/w/src/w.rs       | 21 +++++++++++++++++++++
 tests/by-util/test_w.rs |  6 +++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/uu/w/Cargo.toml b/src/uu/w/Cargo.toml
index 6be5ccf..e8f9c23 100644
--- a/src/uu/w/Cargo.toml
+++ b/src/uu/w/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
 categories = ["command-line-utilities"]
 
 [dependencies]
-uucore = { workspace = true, features = ["utmpx"] }
+uucore = { workspace = true, features = ["utmpx", "uptime"] }
 clap = { workspace = true }
 chrono = { workspace = true, default-features = false, features = [
   "clock",
diff --git a/src/uu/w/src/w.rs b/src/uu/w/src/w.rs
index 852b6b0..b703179 100644
--- a/src/uu/w/src/w.rs
+++ b/src/uu/w/src/w.rs
@@ -12,6 +12,9 @@ use libc::{sysconf, _SC_CLK_TCK};
 #[cfg(target_os = "linux")]
 use std::{collections::HashMap, fs, path::Path, time::SystemTime};
 use std::{process, time::Duration};
+use uucore::uptime::{
+    get_formated_uptime, get_formatted_loadavg, get_formatted_nusers, get_formatted_time,
+};
 #[cfg(target_os = "linux")]
 use uucore::utmpx::Utmpx;
 use uucore::{error::UResult, format_usage, help_about, help_usage};
@@ -184,6 +187,23 @@ fn fetch_user_info() -> Result<Vec<UserInfo>, std::io::Error> {
     Ok(user_info_list)
 }
 
+fn print_uptime() {
+    print!(" {} ", get_formatted_time());
+    match get_formated_uptime(None) {
+        Ok(uptime) => {
+            print!("{}, ", uptime);
+        }
+        Err(_) => {
+            print!("up ???? days ??:??, ");
+        }
+    }
+    print!(" {}", get_formatted_nusers());
+    if let Ok(loadavg) = get_formatted_loadavg() {
+        print!(",  {}", loadavg);
+    }
+    println!();
+}
+
 #[cfg(any(target_os = "macos", target_os = "windows"))]
 fn fetch_user_info() -> Result<Vec<UserInfo>, std::io::Error> {
     Ok(Vec::new())
@@ -200,6 +220,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     match fetch_user_info() {
         Ok(user_info) => {
             if !no_header {
+                print_uptime();
                 if short {
                     println!("{:<9}{:<9}{:<7}{:<}", "USER", "TTY", "IDLE", "WHAT");
                 } else {
diff --git a/tests/by-util/test_w.rs b/tests/by-util/test_w.rs
index 57cd8c2..41bbc76 100644
--- a/tests/by-util/test_w.rs
+++ b/tests/by-util/test_w.rs
@@ -26,6 +26,10 @@ fn test_no_header() {
 
         let result = cmd.stdout_str();
 
+        assert!(match result.lines().next() {
+            None => true,
+            Some(line) => !line.contains("user") && !line.contains("load average"),
+        });
         assert!(!result.contains("USER     TTY      LOGIN@   IDLE   JCPU   PCPU WHAT"));
     }
 }
@@ -41,7 +45,7 @@ fn test_option_short() {
 
     let cmd_output = cmd.stdout_str();
     let cmd_output_lines: Vec<&str> = cmd_output.split('\n').collect();
-    let line_output_header = cmd_output_lines[0];
+    let line_output_header = cmd_output_lines[1];
     let line_output_data_words: Vec<&str> = cmd_output_lines[1]
         .trim()
         .split(' ')

From 9313de7f0e4e3512183a3792d50b900726775730 Mon Sep 17 00:00:00 2001
From: Bluemangoo <chenfy2006@qq.com>
Date: Sat, 5 Apr 2025 00:59:51 +0800
Subject: [PATCH 2/2] w: add uptime header

---
 src/uu/w/src/w.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/uu/w/src/w.rs b/src/uu/w/src/w.rs
index b703179..bacfe94 100644
--- a/src/uu/w/src/w.rs
+++ b/src/uu/w/src/w.rs
@@ -189,14 +189,12 @@ fn fetch_user_info() -> Result<Vec<UserInfo>, std::io::Error> {
 
 fn print_uptime() {
     print!(" {} ", get_formatted_time());
-    match get_formated_uptime(None) {
-        Ok(uptime) => {
-            print!("{}, ", uptime);
-        }
-        Err(_) => {
-            print!("up ???? days ??:??, ");
-        }
+    if let Ok(uptime) = get_formated_uptime(None) {
+        print!("{}, ", uptime);
+    } else {
+        print!("up ???? days ??:??, ");
     }
+
     print!(" {}", get_formatted_nusers());
     if let Ok(loadavg) = get_formatted_loadavg() {
         print!(",  {}", loadavg);