From 5f6e0cbe678f98dded0ab67eaec3d25b96ffb0e0 Mon Sep 17 00:00:00 2001
From: MCredbear <2363764471@qq.com>
Date: Fri, 9 Aug 2024 23:10:49 +0800
Subject: [PATCH] free: Fix incorrect `CachUse` value with `--line --wide`

---
 src/uu/free/src/free.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/uu/free/src/free.rs b/src/uu/free/src/free.rs
index d36065b..2e85f42 100644
--- a/src/uu/free/src/free.rs
+++ b/src/uu/free/src/free.rs
@@ -164,12 +164,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         }
         match parse_meminfo() {
             Ok(mem_info) => {
-                let buff_cache = if wide {
-                    mem_info.buffers
-                } else {
-                    mem_info.buffers + mem_info.cached
-                };
-                let cache = if wide { mem_info.cached } else { 0 };
                 let used = mem_info.total - mem_info.available;
 
                 // function that converts the number to the correct string
@@ -186,7 +180,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                         "SwapUse",
                         n2s(mem_info.swap_used),
                         "CachUse",
-                        n2s(buff_cache + mem_info.reclaimable),
+                        n2s(mem_info.buffers + mem_info.cached + mem_info.reclaimable),
                         "MemUse",
                         n2s(used),
                         "MemFree",
@@ -202,8 +196,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                             n2s(used),
                             n2s(mem_info.free),
                             n2s(mem_info.shared),
-                            n2s(buff_cache),
-                            n2s(cache + mem_info.reclaimable),
+                            n2s(mem_info.buffers),
+                            n2s(mem_info.cached + mem_info.reclaimable),
                             n2s(mem_info.available),
                         );
                     } else {
@@ -215,7 +209,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                             n2s(used),
                             n2s(mem_info.free),
                             n2s(mem_info.shared),
-                            n2s(buff_cache + mem_info.reclaimable),
+                            n2s(mem_info.buffers + mem_info.cached + mem_info.reclaimable),
                             n2s(mem_info.available),
                         )
                     }