lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add extra error tests to swap_*() && fix bytes_read bug

Browse source
This commit is contained in:
raiz 2016-12-27 19:49:31 +03:00
parent a36cb96f27
commit 7db4f5cf67
1 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
slstatus.c
View file

@ -443,23 +443,20 @@ swap_free(void)
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) { if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
warn("swap_free: read error"); warn("swap_free: read error");
fclose(fp); fclose(fp);
return smprintf("%s", UNKNOWN_STR);
} }
buf[bytes_read] = '\0'; buf[bytes_read] = '\0';
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) { if ((match = strstr(buf, "SwapTotal")) == NULL) {
warn("Failed to read from /proc/meminfo"); return smprintf("%s", UNKNOWN_STR);
return smprintf(UNKNOWN_STR);
} }
match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}
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("%f", (float)free / 1024 / 1024); return smprintf("%f", (float)free / 1024 / 1024);
@ -480,20 +477,19 @@ swap_perc(void)
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_perc: read error");
fclose(fp);
return smprintf("%s", UNKNOWN_STR);
}
buf[bytes_read] = '\0'; buf[bytes_read] = '\0';
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) { if ((match = strstr(buf, "SwapTotal")) == NULL) {
warn("Failed to read from /proc/meminfo"); return smprintf("%s", UNKNOWN_STR);
return smprintf(UNKNOWN_STR);
} }
match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}
if ((match = strstr(buf, "SwapCached")) == NULL) { if ((match = strstr(buf, "SwapCached")) == NULL) {
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
@ -505,7 +501,6 @@ swap_perc(void)
} }
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);
} }
@ -523,19 +518,19 @@ swap_total(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) {
buf[bytes_read] = '\0'; warn("swap_total: read error");
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) { return smprintf("%s", UNKNOWN_STR);
warn("Failed to read from /proc/meminfo");
return smprintf(UNKNOWN_STR);
} }
match = strstr(buf, "SwapTotal"); buf[bytes_read] = '\0';
sscanf(match, "SwapTotal: %ld kB\n", &total); fclose(fp);
if (total == 0) {
return smprintf(UNKNOWN_STR); if ((match = strstr(buf, "SwapTotal")) == NULL) {
return smprintf("%s", UNKNOWN_STR);
} }
sscanf(match, "SwapTotal: %ld kB\n", &total);
return smprintf("%f", (float)total / 1024 / 1024); return smprintf("%f", (float)total / 1024 / 1024);
} }
@ -554,24 +549,28 @@ swap_used(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_used: read error");
fclose(fp);
return smprintf("%s", UNKNOWN_STR);
}
buf[bytes_read] = '\0'; buf[bytes_read] = '\0';
fclose(fp); fclose(fp);
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
warn("Failed to read from /proc/meminfo");
return smprintf(UNKNOWN_STR);
}
match = strstr(buf, "SwapTotal"); if ((match = strstr(buf, "SwapTotal")) == NULL) {
return smprintf("%s", UNKNOWN_STR);
}
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
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("%f", (float)(total - free - cached) / 1024 / 1024); return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);