uptime: make it compile on Android & Redox

Author: cakebaker

src/uu/uptime/src/uptime.rs

@@ -19,7 +19,7 @@ use clap::{Arg, ArgAction, Command};
 use uucore::format_usage;
 
 #[cfg(unix)]
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "redox", target_os = "android")))]
 use uucore::utmpx::*;
 
 pub mod options {
@@ -162,7 +162,7 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> {
     print_time();
     let user_count;
 
-    #[cfg(not(target_os = "openbsd"))]
+    #[cfg(not(any(target_os = "openbsd", target_os = "redox", target_os = "android")))]
     {
         let (boot_time, count) = process_utmpx(Some(file_path));
         if let Some(time) = boot_time {
@@ -176,7 +176,7 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> {
         user_count = count;
     }
 
-    #[cfg(target_os = "openbsd")]
+    #[cfg(any(target_os = "openbsd", target_os = "redox", target_os = "android"))]
     {
         let upsecs = get_uptime(None)?;
         if upsecs >= 0 {
@@ -198,12 +198,17 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> {
 
 fn uptime_since() -> UResult<()> {
     #[cfg(unix)]
-    #[cfg(not(target_os = "openbsd"))]
+    #[cfg(not(any(target_os = "openbsd", target_os = "redox", target_os = "android")))]
     let uptime = {
         let (boot_time, _) = process_utmpx(None);
         get_uptime(boot_time)?
     };
-    #[cfg(any(windows, target_os = "openbsd"))]
+    #[cfg(any(
+        windows,
+        target_os = "openbsd",
+        target_os = "redox",
+        target_os = "android"
+    ))]
     let uptime = get_uptime(None)?;
 
     let since_date = Local
@@ -233,7 +238,7 @@ fn print_loadavg() {
 }
 
 #[cfg(unix)]
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "redox", target_os = "android")))]
 fn process_utmpx(file: Option<&OsString>) -> (Option<time_t>, usize) {
     let mut nusers = 0;
     let mut boot_time = None;

src/uucore/src/lib/features/uptime.rs

@@ -120,6 +120,12 @@ pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {
     }
 }
 
+// TODO implement functionality
+#[cfg(any(target_os = "android", target_os = "redox"))]
+pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {
+    Err(UptimeError::SystemUptime)?
+}
+
 /// Get the system uptime
 ///
 /// # Arguments
@@ -130,7 +136,7 @@ pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {
 ///
 /// Returns a UResult with the uptime in seconds if successful, otherwise an UptimeError.
 #[cfg(unix)]
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "android", target_os = "redox")))]
 pub fn get_uptime(boot_time: Option<time_t>) -> UResult<i64> {
     use crate::utmpx::Utmpx;
     use libc::BOOT_TIME;
@@ -251,7 +257,7 @@ pub fn get_formatted_uptime(boot_time: Option<time_t>) -> UResult<String> {
 ///
 /// Returns the number of users currently logged in if successful, otherwise 0.
 #[cfg(unix)]
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "android", target_os = "redox")))]
 // see: https://gitlab.com/procps-ng/procps/-/blob/4740a0efa79cade867cfc7b32955fe0f75bf5173/library/uptime.c#L63-L115
 pub fn get_nusers() -> usize {
     use crate::utmpx::Utmpx;
@@ -293,6 +299,12 @@ pub fn get_nusers(file: &str) -> usize {
         .count()
 }
 
+// TODO implement functionality
+#[cfg(any(target_os = "android", target_os = "redox"))]
+pub fn get_nusers() -> usize {
+    0
+}
+
 /// Get the number of users currently logged in
 ///
 /// # Returns
@@ -391,6 +403,7 @@ pub fn get_formatted_nusers() -> String {
 /// Returns a UResult with the load average if successful, otherwise an UptimeError.
 /// The load average is a tuple of three floating point numbers representing the 1-minute, 5-minute, and 15-minute load averages.
 #[cfg(unix)]
+#[cfg(not(any(target_os = "android", target_os = "redox")))]
 pub fn get_loadavg() -> UResult<(f64, f64, f64)> {
     use crate::libc::c_double;
     use libc::getloadavg;
@@ -406,6 +419,12 @@ pub fn get_loadavg() -> UResult<(f64, f64, f64)> {
     }
 }
 
+// TODO implement functionality
+#[cfg(any(target_os = "android", target_os = "redox"))]
+pub fn get_loadavg() -> UResult<(f64, f64, f64)> {
+    Err(UptimeError::SystemLoadavg)?
+}
+
 /// Get the system load average
 /// Windows does not have an equivalent to the load average on Unix-like systems.
 ///