From c30ef2f52339b3e7bd35f034fafda98b77647419 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jan 2024 23:07:26 +0300 Subject: [PATCH] GetMem fixed --- kfetch | Bin 18440 -> 0 bytes src/fetch.c | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100755 kfetch diff --git a/kfetch b/kfetch deleted file mode 100755 index 42bda444cf7e6e3b178e8e22afd87f49fc6d0037..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18440 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 diff --git a/src/fetch.c b/src/fetch.c index 13665cc..194da6b 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -186,19 +186,20 @@ int GetMem(const char *title, const FETCH fetch) { if (fp == NULL) return 1; - off_t free = 0, total = 0; - if (fscanf(fp, "MemTotal: %lu kB\nMemFree: %lu kB", &total, &free) < 0) + off_t free = 0, total = 0, cached = 0, buffer = 0, unused = 0; + if (fscanf(fp, "MemTotal: %lu kB\nMemFree: %lu kB\nMemAvailable: %lu kB\nBuffers: %lu kB\nCached: %lu kB", &total, &free, &unused, &buffer, &cached) < 0) return 1; fclose(fp); + off_t used = (total - (cached + free + buffer)) / 1024; #ifdef PRINT_USED_AND_TOTAL_MEM - printf("%s%s%s%lumb / %lumb", fetch.color, title, fetch.font_color, (uintmax_t)(total - free) / 1024, (uintmax_t)total / 1024); + printf("%s%s%s%lumb / %lumb", fetch.color, title, fetch.font_color, (uintmax_t)used, (uintmax_t)total / 1024); #elif PRINT_TOTALMEM printf("%s%s%s%lumb", fetch.color, title, fetch.font_color, (uintmax_t)total / 1024); #else - printf("%s%s%s%lumb", fetch.color, title, fetch.font_color, (uintmax_t)(total - free) / 1024); + printf("%s%s%s%lumb", fetch.color, title, fetch.font_color, (uintmax_t)used); #endif