em/slstatus
1
0
Fork 0
Code Releases Activity

swap_*(): add more error tests

Browse Source
This commit is contained in:
raiz 2016-12-27 19:26:04 +03:00
parent 862d158b7c
commit a36cb96f27
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
slstatus.c
View File

@ -439,9 +439,15 @@ swap_free(void)
warn("Failed to open file /proc/meminfo"); warn("Failed to open file /proc/meminfo");
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
warn("swap_free: read error");
fclose(fp);
}
buf[bytes_read] = '\0'; buf[bytes_read] = '\0';
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) { if (bytes_read == 0 || bytes_read == sizeof(buf)) {
warn("Failed to read from /proc/meminfo"); warn("Failed to read from /proc/meminfo");
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
@ -473,9 +479,11 @@ swap_perc(void)
warn("Failed to open file /proc/meminfo"); warn("Failed to open file /proc/meminfo");
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp); bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
buf[bytes_read] = '\0'; buf[bytes_read] = '\0';
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) { if (bytes_read == 0 || bytes_read == sizeof(buf)) {
warn("Failed to read from /proc/meminfo"); warn("Failed to read from /proc/meminfo");
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
@ -487,12 +495,17 @@ swap_perc(void)
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
match = strstr(buf, "SwapCached"); if ((match = strstr(buf, "SwapCached")) == NULL) {
return smprintf("%s", UNKNOWN_STR);
}
sscanf(match, "SwapCached: %ld kB\n", &cached); sscanf(match, "SwapCached: %ld kB\n", &cached);
match = strstr(buf, "SwapFree"); if ((match = strstr(buf, "SwapFree")) == NULL) {
return smprintf("%s", UNKNOWN_STR);
}
sscanf(match, "SwapFree: %ld kB\n", &free); sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%d%%", 100 * (total - free - cached) / total); return smprintf("%d%%", 100 * (total - free - cached) / total);
} }