exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed ram usage (openbsd)

Browse source
This commit is contained in:
adri 2022-06-24 15:46:42 +02:00
parent 2292074ec4
commit 58be16c1aa
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
uwufetch.c
View file

@ -1180,24 +1180,36 @@ struct info get_info()
FILE* meminfo; FILE* meminfo;
#ifdef __BSD__ #ifdef __BSD__
#ifndef __OPENBSD__
meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative for freebsd meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative for freebsd
#else
meminfo = popen("LANG=EN_us vmstat 2> /dev/null | grep -v 'procs' | grep -v 'r' | awk '{print $3 \" / \" $4}'", "r"); // free alternative for openbsd
#endif
#else #else
// getting memory info from /proc/meminfo: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 // getting memory info from /proc/meminfo: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
meminfo = fopen("/proc/meminfo", "r"); // popen("LANG=EN_us free -m 2> /dev/null", "r"); // get ram info with free meminfo = fopen("/proc/meminfo", "r"); // popen("LANG=EN_us free -m 2> /dev/null", "r"); // get ram info with free
#endif #endif
// brackets are here to restrict the access to this int variables, which are temporary // brackets are here to restrict the access to this int variables, which are temporary
{ {
#ifndef __OPENBSD__
int memtotal = 0, shmem = 0, memfree = 0, buffers = 0, cached = 0, sreclaimable = 0; int memtotal = 0, shmem = 0, memfree = 0, buffers = 0, cached = 0, sreclaimable = 0;
#endif
while (fgets(buffer, sizeof(buffer), meminfo)) { while (fgets(buffer, sizeof(buffer), meminfo)) {
#ifndef __OPENBSD__
sscanf(buffer, "MemTotal: %d", &memtotal); sscanf(buffer, "MemTotal: %d", &memtotal);
sscanf(buffer, "Shmem: %d", &shmem); sscanf(buffer, "Shmem: %d", &shmem);
sscanf(buffer, "MemFree: %d", &memfree); sscanf(buffer, "MemFree: %d", &memfree);
sscanf(buffer, "Buffers: %d", &buffers); sscanf(buffer, "Buffers: %d", &buffers);
sscanf(buffer, "Cached: %d", &cached); sscanf(buffer, "Cached: %d", &cached);
sscanf(buffer, "SReclaimable: %d", &sreclaimable); sscanf(buffer, "SReclaimable: %d", &sreclaimable);
#else
sscanf(buffer, "%dM / %dM", &user_info.ram_used, &user_info.ram_total);
#endif
} }
#ifndef __OPENBSD__
user_info.ram_total = memtotal / 1024; user_info.ram_total = memtotal / 1024;
user_info.ram_used = ((memtotal + shmem) - (memfree + buffers + cached + sreclaimable)) / 1024; user_info.ram_used = ((memtotal + shmem) - (memfree + buffers + cached + sreclaimable)) / 1024;
#endif
} }
// while (fgets(buffer, sizeof(buffer), meminfo)) // old way to get ram usage that uses the "free" command // while (fgets(buffer, sizeof(buffer), meminfo)) // old way to get ram usage that uses the "free" command

BIN
uwufetch.core Normal file
View file

Binary file not shown.