uptime: fix issue in licence, formatting, spell and ci

Author: Bluemangoo

.github/workflows/CICD.yml

@@ -58,6 +58,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: dtolnay/rust-toolchain@nightly
     ## note: requires 'nightly' toolchain b/c `cargo-udeps` uses the `rustc` '-Z save-analysis' option
     ## * ... ref: <https://github.com/est31/cargo-udeps/issues/73>
@@ -112,6 +116,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
@@ -171,6 +179,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ env.RUST_MIN_SRV }}
@@ -264,7 +276,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - if: ${{ contains(matrix.os, 'ubuntu') }}
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
       run: |
         sudo apt-get update -y
         sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
@@ -324,7 +336,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - if: ${{ contains(matrix.os, 'ubuntu') }}
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
       run: |
         sudo apt-get update -y
         sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
@@ -357,7 +369,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - if: ${{ contains(matrix.os, 'ubuntu') }}
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
       run: |
         sudo apt-get update -y
         sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
@@ -519,7 +531,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - if: ${{ contains(matrix.os, 'ubuntu') }}
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
       run: |
         sudo apt-get update -y
         sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
@@ -625,6 +637,9 @@ jobs:
         # ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
         if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
           printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
+          if [[ "${{ matrix.job.target }}" == *"linux"* ]]; then
+            printf "[target.${{ matrix.job.target }}]\npre-build = [\"apt-get update\", \"apt-get install -y apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev\"]\n" >> Cross.toml
+          fi
         fi
         # * executable for `strip`?
         STRIP="strip"
@@ -820,6 +835,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       uses: mozilla-actions/[email protected]
@@ -902,6 +921,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ env.RUST_MIN_SRV }}

.github/workflows/code-quality.yml

@@ -79,6 +79,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - if: ${{ contains(matrix.job.os, 'ubuntu') }}
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable

Cargo.lock

@@ -302,7 +302,6 @@ iana-time-zone = "0.1.57"
 indicatif = "0.17.8"
 itertools = "0.14.0"
 libc = "0.2.153"
-libsystemd-sys = "0.9.3"
 lscolors = { version = "0.20.0", default-features = false, features = [
   "gnu_legacy",
 ] }
@@ -317,6 +316,7 @@ num-traits = "0.2.19"
 number_prefix = "0.4"
 once_cell = "1.19.0"
 onig = { version = "~6.4", default-features = false }
+pkg-config = "0.3.31"
 parse_datetime = "0.7.0"
 phf = "0.11.2"
 phf_codegen = "0.11.2"

Cargo.toml

@@ -19,17 +19,17 @@ path = "src/uptime.rs"
 [dependencies]
 chrono = { workspace = true }
 clap = { workspace = true }
-uucore = { workspace = true, features = ["libc", "utmpx", "uptime"] }
 thiserror = { workspace = true }
-
-[target.'cfg(target_os="linux")'.dependencies]
-libsystemd-sys = { workspace = true }
+uucore = { workspace = true, features = ["libc", "utmpx", "uptime"] }
 
 [target.'cfg(target_os = "openbsd")'.dependencies]
 utmp-classic = { workspace = true }
 
 [target.'cfg(target_os="windows")'.dependencies]
-windows-sys = {workspace = true, features = ["Win32_System_RemoteDesktop", "Wdk_System_SystemInformation"]}
+windows-sys = { workspace = true, features = [
+  "Win32_System_RemoteDesktop",
+  "Wdk_System_SystemInformation",
+] }
 
 [[bin]]
 name = "uptime"

src/uu/uptime/Cargo.toml

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore getloadavg behaviour loadavg uptime upsecs updays upmins uphours boottime nusers utmpxname gettime clockid
+// spell-checker:ignore getloadavg behaviour loadavg uptime upsecs updays upmins uphours boottime nusers utmpxname gettime clockid formated
 
 use chrono::{Local, TimeZone, Utc};
 use clap::ArgMatches;
@@ -294,7 +294,3 @@ fn print_uptime(boot_time: Option<time_t>) -> UResult<()> {
     print!("up  {},  ", get_formated_uptime(boot_time)?);
     Ok(())
 }
-
-
-
-

src/uu/uptime/src/uptime.rs

@@ -71,6 +71,9 @@ clap = { workspace = true }
 once_cell = { workspace = true }
 tempfile = { workspace = true }
 
+[build-dependencies]
+pkg-config = { workspace = true }
+
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi-util = { workspace = true, optional = true }
 windows-sys = { workspace = true, optional = true, default-features = false, features = [
@@ -81,9 +84,6 @@ windows-sys = { workspace = true, optional = true, default-features = false, fea
   "Win32_System_WindowsProgramming",
 ] }
 
-[target.'cfg(target_os="linux")'.dependencies]
-libsystemd-sys = { workspace = true, optional = true }
-
 [target.'cfg(target_os = "openbsd")'.dependencies]
 utmp-classic = { workspace = true, optional = true }
 
@@ -130,4 +130,4 @@ version-cmp = []
 wide = []
 custom-tz-fmt = []
 tty = []
-uptime = ["libc", "windows-sys", "utmpx", "libsystemd-sys", "utmp-classic"]
+uptime = ["libc", "windows-sys", "utmpx", "utmp-classic"]

src/uucore/Cargo.toml

@@ -0,0 +1,6 @@
+// spell-checker:ignore libsystemd
+fn main() {
+    #[cfg(target_os = "linux")]
+    #[cfg(feature = "uptime")]
+    pkg_config::find_library("libsystemd").unwrap();
+}

src/uucore/build.rs

@@ -34,6 +34,8 @@ pub mod ringbuffer;
 pub mod sum;
 #[cfg(feature = "update-control")]
 pub mod update_control;
+#[cfg(feature = "uptime")]
+pub mod uptime;
 #[cfg(feature = "version-cmp")]
 pub mod version_cmp;
 
@@ -72,6 +74,4 @@ pub mod signals;
 pub mod utmpx;
 // ** windows-only
 #[cfg(all(windows, feature = "wide"))]
-pub mod wide; 
-#[cfg(feature = "uptime")]
-pub mod uptime;
+pub mod wide;

src/uucore/src/lib/features.rs

@@ -1,7 +1,19 @@
+// spell-checker:ignore gettime BOOTTIME clockid boottime formated nusers loadavg getloadavg
+
 use crate::error::{UResult, USimpleError};
 use chrono::Local;
 use libc::time_t;
 
+#[cfg(target_os = "linux")]
+extern "C" {
+    pub fn sd_booted() -> libc::c_int;
+    pub fn sd_get_sessions(sessions: *mut *mut *mut libc::c_char) -> libc::c_int;
+    pub fn sd_session_get_class(
+        session: *const libc::c_char,
+        class: *mut *mut libc::c_char,
+    ) -> libc::c_int;
+}
+
 pub fn get_formatted_time() -> String {
     Local::now().time().format("%H:%M:%S").to_string()
 }
@@ -108,15 +120,13 @@ pub fn get_formated_uptime(boot_time: Option<time_t>) -> UResult<String> {
     }
 }
 
-/// Returns the number of logged users from systemd, and return `-1` if unavailable.
 #[cfg(target_os = "linux")]
 pub fn get_nusers_systemd() -> UResult<usize> {
+    use crate::libc::*;
+    use std::ffi::CStr;
+    use std::ptr;
+
     unsafe {
-        use crate::libc::free;
-        use libsystemd_sys::daemon::sd_booted;
-        use libsystemd_sys::login::{sd_get_sessions, sd_session_get_class};
-        use std::ffi::{c_char, c_void, CStr};
-        use std::ptr;
         // systemd
         if sd_booted() > 0 {
             let mut sessions_list: *mut *mut c_char = ptr::null_mut();

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

@@ -64,10 +64,10 @@ pub use crate::features::ranges;
 pub use crate::features::ringbuffer;
 #[cfg(feature = "sum")]
 pub use crate::features::sum;
-#[cfg(feature = "uptime")]
-pub use crate::features::uptime;
 #[cfg(feature = "update-control")]
 pub use crate::features::update_control;
+#[cfg(feature = "uptime")]
+pub use crate::features::uptime;
 #[cfg(feature = "version-cmp")]
 pub use crate::features::version_cmp;