snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmmemfree: Add error handling for fscanf.

Browse source
This commit is contained in:
Doug Torrance 2018-07-13 11:12:55 -04:00 committed by Carlos R. Mafra
parent 08a8a6a70e
commit 872f0df996
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wmmemfree/mem_linux.c
View file

@ -27,6 +27,7 @@ long long int swp_total, swp_used, swp_free;
void mem_getfree() void mem_getfree()
{ {
FILE *file; FILE *file;
int count;
file = fopen("/proc/meminfo", "r"); file = fopen("/proc/meminfo", "r");
if(!file) if(!file)
@ -34,13 +35,24 @@ void mem_getfree()
perror("/proc/meminfo"); perror("/proc/meminfo");
exit(1); exit(1);
} }
fscanf(file, "MemTotal: %lld kB MemFree: %lld kB MemAvailable: %*d kB " count = fscanf(file, "MemTotal: %lld kB MemFree: %lld kB "
"Buffers: %lld kB Cached: %lld kB", "MemAvailable: %*d kB Buffers: %lld kB Cached: %lld kB",
&mem_total, &mem_free, &mem_buffers, &mem_cached); &mem_total, &mem_free, &mem_buffers, &mem_cached);
if (count != 4) {
mem_total = 1;
mem_free = 1;
mem_buffers = 0;
mem_cached = 0;
}
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
while (fgetc(file) != '\n') {} while (fgetc(file) != '\n') {}
} }
fscanf(file, "SwapTotal: %lld kB SwapFree: %lld kB", &swp_total, &swp_free); count = fscanf(file, "SwapTotal: %lld kB SwapFree: %lld kB",
&swp_total, &swp_free);
if (count != 2) {
swp_total = 1;
swp_free = 1;
}
fclose(file); fclose(file);
mem_used = mem_total - mem_free; mem_used = mem_total - mem_free;
swp_used = swp_total - swp_free; swp_used = swp_total - swp_free;