Merge pull request #452 from Bluemangoo/feature/w-c

w: implement `--container`

Author: Krysztal112233

src/uu/w/src/w.rs

@@ -4,7 +4,7 @@
 // file that was distributed with this source code.
 
 #[cfg(target_os = "linux")]
-use chrono::Datelike;
+use chrono::{Datelike, Local};
 use clap::crate_version;
 use clap::{Arg, ArgAction, Command};
 #[cfg(target_os = "linux")]
@@ -134,7 +134,7 @@ fn format_time(time: String) -> Result<String, chrono::format::ParseError> {
         t = t.drain(..time_offset).collect();
     }
     // If login time day is not current day, format like Sat16, or Fri06
-    let current_dt = chrono::Local::now().fixed_offset();
+    let current_dt = Local::now().fixed_offset();
     let dt = chrono::DateTime::parse_from_str(&t, "%Y-%m-%d %H:%M:%S%.f %:z")?;
 
     if current_dt.day() == dt.day() {
@@ -182,6 +182,17 @@ fn fetch_user_info() -> Result<Vec<UserInfo>, std::io::Error> {
     Ok(user_info_list)
 }
 
+#[cfg(target_os = "linux")]
+fn get_uptime_container() -> UResult<i64> {
+    let proc_file = fs::read_to_string("/proc/1/stat")?;
+    let proc_stat: Vec<&str> = proc_file.split_whitespace().collect();
+    let start_time_str = proc_stat.get(21).ok_or(UptimeError::SystemUptime)?;
+    let start_time: i64 = start_time_str
+        .parse()
+        .map_err(|_| UptimeError::SystemUptime)?;
+    Ok(get_uptime(None)? + start_time / get_clock_tick())
+}
+
 pub fn format_uptime_procps(up_secs: i64) -> UResult<String> {
     if up_secs < 0 {
         Err(UptimeError::SystemUptime)?;
@@ -208,9 +219,25 @@ pub fn get_formatted_uptime_procps() -> UResult<String> {
     Ok(format!("up {time_str}"))
 }
 
-fn print_uptime() {
+#[cfg(target_os = "linux")]
+#[inline]
+fn get_formatted_uptime_container_procps() -> UResult<String> {
+    let time_str = format_uptime_procps(get_uptime_container()?)?;
+    Ok(format!("up {time_str}"))
+}
+
+#[allow(unused_variables)]
+fn print_uptime(from_container: bool) {
     print!(" {} ", get_formatted_time());
-    if let Ok(uptime) = get_formatted_uptime_procps() {
+    #[cfg(target_os = "linux")]
+    let uptime = if from_container {
+        get_formatted_uptime_container_procps()
+    } else {
+        get_formatted_uptime_procps()
+    };
+    #[cfg(not(target_os = "linux"))]
+    let uptime = get_formatted_uptime_procps();
+    if let Ok(uptime) = uptime {
         print!("{uptime}, ");
     } else {
         print!("up ???? days ??:??, ");
@@ -235,11 +262,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let no_header = matches.get_flag("no-header");
     let short = matches.get_flag("short");
     let old_style = matches.get_flag("old-style");
+    let container = matches.get_flag("container");
 
     match fetch_user_info() {
         Ok(user_info) => {
             if !no_header {
-                print_uptime();
+                print_uptime(container);
                 if short {
                     println!("{:<9}{:<9}{:<7}{:<}", "USER", "TTY", "IDLE", "WHAT");
                 } else {
@@ -294,6 +322,13 @@ pub fn uu_app() -> Command {
                 .help("Print help information")
                 .action(ArgAction::Help),
         )
+        .arg(
+            Arg::new("container")
+                .short('c')
+                .long("container")
+                .help("show the container uptime instead of system uptime in the header")
+                .action(ArgAction::SetTrue),
+        )
         .arg(
             Arg::new("no-header")
                 .short('h')