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

Merge pull request #60 from dqnk/main

Browse source 
Fixed issue with printing ram #59
This commit is contained in:
TheDarkBug 2021-04-02 12:02:03 +02:00 committed by GitHub
commit c67bcdc40d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
uwufetch.c
View file

@ -41,8 +41,10 @@ struct utsname sys_var;
struct sysinfo sys; struct sysinfo sys;
struct winsize win; struct winsize win;
// all possible ram values obtainable with free command
int ram_total, ram_used = 0;
// initialise the variables to store data, gpu array can hold up to 8 gpus // initialise the variables to store data, gpu array can hold up to 8 gpus
int ram_max = 0, ram_free = 0, pkgs, a_i_flag = 0, target_width = 0; int pkgs, a_i_flag = 0, target_width = 0;
char user[32], host[256], shell[64], version_name[64], cpu_model[256], gpu_model[8][256] = {{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'}}, pkgman_name[64], image_name[32]; char user[32], host[256], shell[64], version_name[64], cpu_model[256], gpu_model[8][256] = {{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'},{'0'}}, pkgman_name[64], image_name[32];
int pkgman(); int pkgman();
@ -161,7 +163,7 @@ void print_info() {
// print ram to uptime and colors // print ram to uptime and colors
printf("\033[18C%s%sWAM %s%i MB/%i MB\n", printf("\033[18C%s%sWAM %s%i MB/%i MB\n",
NORMAL, BOLD, NORMAL, (ram_max - ram_free), ram_max); NORMAL, BOLD, NORMAL, (ram_used), ram_total);
printf("\033[18C%s%sSHELL %s%s\n", printf("\033[18C%s%sSHELL %s%s\n",
NORMAL, BOLD, NORMAL, shell); NORMAL, BOLD, NORMAL, shell);
printf("\033[18C%s%sPKGS %s%s%d %s\n", printf("\033[18C%s%sPKGS %s%s%d %s\n",
@ -218,14 +220,22 @@ void get_info() { // get all necessary info
truncate_name(sys_var.machine); truncate_name(sys_var.machine);
// ram // ram
FILE *meminfo = fopen("/proc/meminfo", "r");
FILE *meminfo;
meminfo = popen("free 2> /dev/null", "r");
while (fgets(line, sizeof(line), meminfo)) { while (fgets(line, sizeof(line), meminfo)) {
sscanf(line, "MemFree: %d kB", &ram_free); // free command prints like this: "Mem:" total used free shared buff/cache available
sscanf(line, "MemTotal: %d kB", &ram_max);
if (ram_max > 0 && ram_free > 0) { if(sscanf(line, "Mem: %d %d", &ram_total, &ram_used)){
ram_max *= 0.001024; // convert to megabytes
ram_free *= 0.001024; if (ram_total > 0 && ram_used > 0) {
break; // data is in bytes
ram_total /= 1024;
ram_used /= 1024;
break;
}
} }
} }
fclose(meminfo); fclose(meminfo);