X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b5813a7f677303c4f3701bb938f98e592f869a7a..d4d2646f6387f0245ce1e285382f85b2cb6c0300:/slstatus.c diff --git a/slstatus.c b/slstatus.c index cd2def6..23ed940 100644 --- a/slstatus.c +++ b/slstatus.c @@ -2,10 +2,13 @@ /* global libraries */ #include +#include #include #include #include #include +#include +#include #include #include #include @@ -13,20 +16,46 @@ /* local libraries */ #include "config.h" +/* check file macro */ +#define CHECK_FILE(X,Y) do { \ + if (stat(X,&Y) < 0) return -1; \ + if (!S_ISREG(Y.st_mode)) return -1; \ +} while (0); + /* functions */ +int config_check(); void setstatus(char *str); +char *smprintf(char *fmt, ...); char *get_battery(); char *get_cpu_temperature(); char *get_cpu_usage(); char *get_datetime(); char *get_ram_usage(); -char *smprintf(char *fmt, ...); char *get_volume(); char *get_wifi_signal(); /* global variables */ static Display *dpy; +/* check configured paths */ +int +config_check() +{ + struct stat fs; + + /* check all files in the config.h file */ + CHECK_FILE(batterynowfile, fs); + CHECK_FILE(batteryfullfile, fs); + CHECK_FILE(tempfile, fs); + + /* check update interval */ + if (update_interval < 1) + return -1; + + /* exit successfully */ + return 0; +} + /* set statusbar (WM_NAME) */ void setstatus(char *str) @@ -35,21 +64,35 @@ setstatus(char *str) XSync(dpy, False); } +/* smprintf function */ +char * +smprintf(char *fmt, ...) +{ + va_list fmtargs; + char *ret = NULL; + va_start(fmtargs, fmt); + if (vasprintf(&ret, fmt, fmtargs) < 0) + return NULL; + va_end(fmtargs); + + return ret; +} + /* battery percentage */ char * get_battery() { - int battery_now, battery_full, battery_perc; + int now, full, perc; FILE *fp; /* open battery now file */ if (!(fp = fopen(batterynowfile, "r"))) { fprintf(stderr, "Error opening battery file."); - exit(1); + return smprintf("n/a"); } /* read value */ - fscanf(fp, "%i", &battery_now); + fscanf(fp, "%i", &now); /* close battery now file */ fclose(fp); @@ -57,20 +100,20 @@ get_battery() /* open battery full file */ if (!(fp = fopen(batteryfullfile, "r"))) { fprintf(stderr, "Error opening battery file."); - exit(1); + return smprintf("n/a"); } /* read value */ - fscanf(fp, "%i", &battery_full); + fscanf(fp, "%i", &full); /* close battery full file */ fclose(fp); /* calculate percent */ - battery_perc = battery_now / (battery_full / 100); + perc = now / (full / 100); - /* return batt_perc as string */ - return smprintf("%d%%", battery_perc); + /* return perc as string */ + return smprintf("%d%%", perc); } /* cpu temperature */ @@ -83,7 +126,7 @@ get_cpu_temperature() /* open temperature file */ if (!(fp = fopen(tempfile, "r"))) { fprintf(stderr, "Could not open temperature file.\n"); - exit(1); + return smprintf("n/a"); } /* extract temperature */ @@ -100,14 +143,14 @@ get_cpu_temperature() char * get_cpu_usage() { - int cpu_perc; + int perc; long double a[4], b[4]; FILE *fp; /* open stat file */ if (!(fp = fopen("/proc/stat","r"))) { fprintf(stderr, "Error opening stat file."); - exit(1); + return smprintf("n/a"); } /* read values */ @@ -122,7 +165,7 @@ get_cpu_usage() /* open stat file */ if (!(fp = fopen("/proc/stat","r"))) { fprintf(stderr, "Error opening stat file."); - exit(1); + return smprintf("n/a"); } /* read values */ @@ -132,10 +175,10 @@ get_cpu_usage() fclose(fp); /* calculate avg in this second */ - cpu_perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3])); + perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3])); - /* return cpu_perc as string */ - return smprintf("%d%%", cpu_perc); + /* return perc as string */ + return smprintf("%d%%", perc); } /* date and time */ @@ -143,72 +186,48 @@ char * get_datetime() { time_t tm; - size_t bufsize = 19; + size_t bufsize = 64; char *buf = malloc(bufsize); /* get time in format */ time(&tm); if(!strftime(buf, bufsize, timeformat, localtime(&tm))) { fprintf(stderr, "Strftime failed.\n"); - exit(1); + return smprintf("n/a"); } /* return time */ - return buf; + return smprintf("%s", buf); } /* ram percentage */ char * get_ram_usage() { - int ram_perc; - long total, free, available; + int perc; + long total, free, buffers, cached; FILE *fp; /* open meminfo file */ if (!(fp = fopen("/proc/meminfo", "r"))) { fprintf(stderr, "Error opening meminfo file."); - exit(1); + return smprintf("n/a"); } /* read the values */ fscanf(fp, "MemTotal: %ld kB\n", &total); fscanf(fp, "MemFree: %ld kB\n", &free); - fscanf(fp, "MemAvailable: %ld kB\n", &available); + fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers); + fscanf(fp, "Cached: %ld kB\n", &cached); /* close meminfo file */ fclose(fp); /* calculate percentage */ - ram_perc = 100 * (total - available) / total; + perc = 100 * ((total - free) - (buffers + cached)) / total; - /* return ram_perc as string */ - return smprintf("%d%%",ram_perc); -} - -/* smprintf function */ -char * -smprintf(char *fmt, ...) -{ - va_list fmtargs; - char *ret; - int len; - - va_start(fmtargs, fmt); - len = vsnprintf(NULL, 0, fmt, fmtargs); - va_end(fmtargs); - - ret = malloc(++len); - if (ret == NULL) { - fprintf(stderr, "Malloc error."); - exit(1); - } - - va_start(fmtargs, fmt); - vsnprintf(ret, len, fmt, fmtargs); - va_end(fmtargs); - - return ret; + /* return perc as string */ + return smprintf("%d%%", perc); } /* alsa volume percentage */ @@ -265,7 +284,6 @@ get_wifi_signal() FILE *fp; /* generate the path name */ - memset(path, 0, sizeof path); strcat(path, path_start); strcat(path, wificard); @@ -274,7 +292,7 @@ get_wifi_signal() /* open wifi file */ if(!(fp = fopen(path, "r"))) { fprintf(stderr, "Error opening wifi operstate file."); - exit(1); + return smprintf("n/a"); } /* read the status */ @@ -285,13 +303,13 @@ get_wifi_signal() /* check if interface down */ if(strcmp(status, "up\n") != 0){ - return "n/a"; + return smprintf("n/a"); } /* open wifi file */ if (!(fp = fopen("/proc/net/wireless", "r"))) { fprintf(stderr, "Error opening wireless file."); - exit(1); + return smprintf("n/a"); } /* extract the signal strength */ @@ -317,13 +335,19 @@ int main() { char status[1024]; - char *wifi_signal = NULL; char *battery = NULL; - char *cpu_usage = NULL; char *cpu_temperature = NULL; + char *cpu_usage = NULL; + char *datetime = NULL; char *ram_usage = NULL; char *volume = NULL; - char *datetime = NULL; + char *wifi_signal = NULL; + + /* check config for sanity */ + if (config_check() < 0) { + fprintf(stderr, "Config error, please check paths and interval and recompile!\n"); + exit(1); + } /* open display */ if (!(dpy = XOpenDisplay(0x0))) { @@ -334,26 +358,29 @@ main() /* return status every second */ for (;;) { /* assign the values */ - wifi_signal = get_wifi_signal(); battery = get_battery(); - cpu_usage = get_cpu_usage(); cpu_temperature = get_cpu_temperature(); + cpu_usage = get_cpu_usage(); + datetime = get_datetime(); ram_usage = get_ram_usage(); volume = get_volume(); - datetime = get_datetime(); + wifi_signal = get_wifi_signal(); /* return the status */ sprintf(status, FORMATSTRING, ARGUMENTS); setstatus(status); /* free the values */ - free(wifi_signal); free(battery); - free(cpu_usage); free(cpu_temperature); + free(cpu_usage); + free(datetime); free(ram_usage); free(volume); - free(datetime); + free(wifi_signal); + + /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */ + sleep(update_interval -1); } /* close display */