marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding optional configuration option to "print_disk_info".

Browse Source
This commit is contained in:
Christian Kohlstedde 2015-02-18 23:43:25 +01:00
parent f7b25a15dd
commit 85bb373095
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
i3status.c
View File

@ -386,6 +386,7 @@ int main(int argc, char *argv[]) {
cfg_opt_t disk_opts[] = { cfg_opt_t disk_opts[] = {
CFG_STR("format", "%free", CFGF_NONE), CFG_STR("format", "%free", CFGF_NONE),
CFG_STR("format_not_mounted", NULL, CFGF_NONE),
CFG_STR("prefix_type", "binary", CFGF_NONE), CFG_STR("prefix_type", "binary", CFGF_NONE),
CFG_STR("threshold_type", "percentage_avail", CFGF_NONE), CFG_STR("threshold_type", "percentage_avail", CFGF_NONE),
CFG_FLOAT("low_threshold", 0, CFGF_NONE), CFG_FLOAT("low_threshold", 0, CFGF_NONE),
@ -621,7 +622,7 @@ int main(int argc, char *argv[]) {
CASE_SEC_TITLE("disk") { CASE_SEC_TITLE("disk") {
SEC_OPEN_MAP("disk_info"); SEC_OPEN_MAP("disk_info");
print_disk_info(json_gen, buffer, title, cfg_getstr(sec, "format"), cfg_getstr(sec, "prefix_type"), cfg_getstr(sec, "threshold_type"), cfg_getfloat(sec, "low_threshold")); print_disk_info(json_gen, buffer, title, cfg_getstr(sec, "format"), cfg_getstr(sec, "format_not_mounted"), cfg_getstr(sec, "prefix_type"), cfg_getstr(sec, "threshold_type"), cfg_getfloat(sec, "low_threshold"));
SEC_CLOSE_MAP; SEC_CLOSE_MAP;
} }

2
include/i3status.h
View File

@ -178,7 +178,7 @@ typedef enum {
const char *first_eth_interface(const net_type_t type); const char *first_eth_interface(const net_type_t type);
void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down); void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *prefix_type, const char *threshold_type, const double low_threshold); void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *format_not_mounted, const char *prefix_type, const char *threshold_type, const double low_threshold);
void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds); void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds);
void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t); void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t);
void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t); void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);

28
src/print_disk_info.c
View File

@ -108,7 +108,7 @@ static bool below_threshold(struct statvfs buf, const char *prefix_type, const c
* human readable manner. * human readable manner.
* *
*/ */
void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *prefix_type, const char *threshold_type, const double low_threshold) { void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *format_not_mounted, const char *prefix_type, const char *threshold_type, const double low_threshold) {
const char *walk; const char *walk;
char *outwalk = buffer; char *outwalk = buffer;
bool colorful_output = false; bool colorful_output = false;
@ -126,22 +126,22 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
if (statvfs(path, &buf) == -1) if (statvfs(path, &buf) == -1)
return; return;
FILE *mntentfile = setmntent("/etc/mtab", "r"); if (format_not_mounted != NULL) {
struct mntent *m; FILE *mntentfile = setmntent("/etc/mtab", "r");
bool found = false; struct mntent *m;
bool found = false;
while (NULL != (m = getmntent(mntentfile))) { while (NULL != (m = getmntent(mntentfile))) {
if (strcmp(m->mnt_dir, path) == 0) { if (strcmp(m->mnt_dir, path) == 0) {
found = true; found = true;
break; break;
}
} }
} endmntent(mntentfile);
endmntent(mntentfile);
if (!found) { if (!found) {
*buffer = '\0'; format = format_not_mounted;
OUTPUT_FULL_TEXT(buffer); }
return;
} }
#endif #endif