Merge branch 'main' into renovate/nix-0.x

Author: Krysztal112233

Cargo.lock

@@ -61,7 +61,7 @@ clap = { version = "4.5.4", features = ["wrap_help", "cargo", "env"] }
 clap_complete = "4.5.2"
 clap_mangen = "0.3.0"
 crossterm = "0.29.0"
-ctor = "0.8.0"
+ctor = "0.10.0"
 dirs = "6.0.0"
 jiff = "0.2.15"
 nix = { version = "0.31", default-features = false, features = ["process"] }

Cargo.toml

@@ -71,7 +71,7 @@ pub struct ProcessSelectionSettings {
 impl ProcessSelectionSettings {
     pub fn from_matches(matches: &ArgMatches) -> Self {
         Self {
-            select_all: matches.get_flag("A"),
+            select_all: matches.get_flag("A") || matches.get_flag("e"),
             select_non_session_leaders_with_tty: matches.get_flag("a"),
             select_non_session_leaders: matches.get_flag("d"),
             dont_require_tty: matches.get_flag("x"),

src/uu/ps/src/process_selection.rs

@@ -202,7 +202,10 @@ pub fn uu_app() -> Command {
             Arg::new("A")
                 .short('A')
                 .help("all processes")
-                .visible_short_alias('e')
+                .action(ArgAction::SetTrue),
+            Arg::new("e")
+                .short('e')
+                .help("Select all processes. Identical to -A")
                 .action(ArgAction::SetTrue),
             Arg::new("a")
                 .short('a')

src/uu/ps/src/ps.rs

@@ -211,6 +211,16 @@ pub struct Meminfo {
     pub swap_total: bytesize::ByteSize,
     pub swap_free: bytesize::ByteSize,
 }
+
+#[cfg(target_os = "linux")]
+fn kb_to_kib(mut size: bytesize::ByteSize) -> bytesize::ByteSize {
+    // "kB" means KiB instead of KB
+    // Convert from 1000-based(parsed by bytesize from "kB" ended string) to 1024-based(which it actually is)
+    // See more at https://github.com/uutils/procps/issues/667
+    size.0 = size.0 / 1000 * 1024;
+    size
+}
+
 #[cfg(target_os = "linux")]
 impl Meminfo {
     pub fn current() -> Self {
@@ -221,20 +231,28 @@ impl Meminfo {
     pub fn from_proc_map(proc_map: &HashMap<String, String>) -> Self {
         use std::str::FromStr;
 
-        let mem_total = bytesize::ByteSize::from_str(proc_map.get("MemTotal").unwrap()).unwrap();
-        let mem_free = bytesize::ByteSize::from_str(proc_map.get("MemFree").unwrap()).unwrap();
+        let mem_total =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemTotal").unwrap()).unwrap());
+        let mem_free =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemFree").unwrap()).unwrap());
         let mem_available =
-            bytesize::ByteSize::from_str(proc_map.get("MemAvailable").unwrap()).unwrap();
-        let buffers = bytesize::ByteSize::from_str(proc_map.get("Buffers").unwrap()).unwrap();
-        let cached = bytesize::ByteSize::from_str(proc_map.get("Cached").unwrap()).unwrap();
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemAvailable").unwrap()).unwrap());
+        let buffers =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Buffers").unwrap()).unwrap());
+        let cached =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Cached").unwrap()).unwrap());
         let s_reclaimable =
-            bytesize::ByteSize::from_str(proc_map.get("SReclaimable").unwrap()).unwrap();
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SReclaimable").unwrap()).unwrap());
         let swap_cached =
-            bytesize::ByteSize::from_str(proc_map.get("SwapCached").unwrap()).unwrap();
-        let active = bytesize::ByteSize::from_str(proc_map.get("Active").unwrap()).unwrap();
-        let inactive = bytesize::ByteSize::from_str(proc_map.get("Inactive").unwrap()).unwrap();
-        let swap_total = bytesize::ByteSize::from_str(proc_map.get("SwapTotal").unwrap()).unwrap();
-        let swap_free = bytesize::ByteSize::from_str(proc_map.get("SwapFree").unwrap()).unwrap();
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapCached").unwrap()).unwrap());
+        let active =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Active").unwrap()).unwrap());
+        let inactive =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Inactive").unwrap()).unwrap());
+        let swap_total =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapTotal").unwrap()).unwrap());
+        let swap_free =
+            kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapFree").unwrap()).unwrap());
         Self {
             mem_total,
             mem_free,
@@ -258,7 +276,7 @@ pub struct DiskStatParseError;
 #[cfg(target_os = "linux")]
 impl Display for DiskStatParseError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Debug::fmt("Failed to parse diskstat line", f)
+        Debug::fmt("Failed to parse diskstat line", f)
     }
 }
 

src/uu/vmstat/src/parser.rs

@@ -13,9 +13,24 @@ use uucore::process::geteuid;
 #[test]
 #[cfg(target_os = "linux")]
 fn test_select_all_processes() {
-    for arg in ["-A", "-e"] {
-        // TODO ensure the output format is correct
-        new_ucmd!().arg(arg).succeeds();
+    let expected_headers = ["PID", "TTY", "TIME", "CMD"];
+
+    let args_sets = vec![vec!["-A"], vec!["-e"], vec!["-A", "-e"]];
+    for args in args_sets {
+        let result = new_ucmd!().args(&args).succeeds();
+        let lines: Vec<&str> = result.stdout_str().lines().collect();
+
+        assert!(
+            lines.len() >= 2,
+            "expected at least a header and one process row"
+        );
+
+        let headers: Vec<&str> = lines[0].split_whitespace().collect();
+        assert_eq!(
+            headers, expected_headers,
+            "unexpected header for args: {:?}",
+            args
+        );
     }
 }