X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/178c23e3d2b75a99010987bf3e17a82ff7b83b6a..3468a6e368974ea222ab81c389e0800748541c42:/slstatus.c?ds=sidebyside diff --git a/slstatus.c b/slstatus.c index c4a9e92..cd6cc8f 100644 --- a/slstatus.c +++ b/slstatus.c @@ -1,5 +1,4 @@ /* See LICENSE file for copyright and license details. */ - #include #include #include @@ -28,13 +27,14 @@ #include "arg.h" +#define LEN(x) (sizeof (x) / sizeof *(x)) + struct arg { const char *(*func)(); const char *fmt; const char *args; }; -static const char *bprintf(const char *fmt, ...); static const char *battery_perc(const char *bat); static const char *battery_power(const char *bat); static const char *battery_state(const char *bat); @@ -69,8 +69,6 @@ static const char *username(void); static const char *vol_perc(const char *card); static const char *wifi_perc(const char *iface); static const char *wifi_essid(const char *iface); -static void sighandler(const int signo); -static void usage(void); char *argv0; static unsigned short int delay = 0; @@ -108,12 +106,12 @@ battery_perc(const char *bat) fp = fopen(path, "r"); if (fp == NULL) { warn("Failed to open file %s", path); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%i", &perc); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%d", perc); } @@ -129,12 +127,12 @@ battery_power(const char *bat) fp = fopen(path, "r"); if (fp == NULL) { warn("Failed to open file %s", path); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%i", &watts); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%d", (watts + 500000) / 1000000); } @@ -160,20 +158,20 @@ battery_state(const char *bat) fp = fopen(path, "r"); if (fp == NULL) { warn("Failed to open file %s", path); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%12s", state); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; - for (i = 0; i < sizeof(map) / sizeof(*map); i++) { + for (i = 0; i < LEN(map); i++) { if (!strcmp(map[i].state, state)) { break; } } - return (i == sizeof(map) / sizeof(*map)) ? "?" : map[i].symbol; + return (i == LEN(map)) ? "?" : map[i].symbol; } static const char * @@ -185,12 +183,12 @@ cpu_freq(void) fp = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r"); if (fp == NULL) { warn("Failed to open file /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%i", &freq); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%d", (freq + 500) / 1000); } @@ -205,12 +203,12 @@ cpu_perc(void) fp = fopen("/proc/stat", "r"); if (fp == NULL) { warn("Failed to open file /proc/stat"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]); fclose(fp); if (n != 4) - return UNKNOWN_STR; + return unknown_str; delay++; sleep(delay); @@ -218,12 +216,12 @@ cpu_perc(void) fp = fopen("/proc/stat", "r"); if (fp == NULL) { warn("Failed to open file /proc/stat"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]); fclose(fp); if (n != 4) - return UNKNOWN_STR; + return unknown_str; 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 bprintf("%d", perc); @@ -236,7 +234,7 @@ datetime(const char *fmt) t = time(NULL); if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0) - return UNKNOWN_STR; + return unknown_str; return buf; } @@ -248,7 +246,7 @@ disk_free(const char *mnt) if (statvfs(mnt, &fs) < 0) { warn("Failed to get filesystem info"); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024); @@ -262,7 +260,7 @@ disk_perc(const char *mnt) if (statvfs(mnt, &fs) < 0) { warn("Failed to get filesystem info"); - return UNKNOWN_STR; + return unknown_str; } perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); @@ -277,7 +275,7 @@ disk_total(const char *mnt) if (statvfs(mnt, &fs) < 0) { warn("Failed to get filesystem info"); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024); @@ -290,7 +288,7 @@ disk_used(const char *mnt) if (statvfs(mnt, &fs) < 0) { warn("Failed to get filesystem info"); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024); @@ -305,12 +303,12 @@ entropy(void) fp= fopen("/proc/sys/kernel/random/entropy_avail", "r"); if (fp == NULL) { warn("Failed to open file /proc/sys/kernel/random/entropy_avail"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%d", &num); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%d", num); } @@ -326,7 +324,7 @@ hostname(void) { if (gethostname(buf, sizeof(buf)) == -1) { warn("hostname"); - return UNKNOWN_STR; + return unknown_str; } return buf; @@ -341,7 +339,7 @@ ip(const char *iface) if (getifaddrs(&ifaddr) == -1) { warn("Failed to get IP address for interface %s", iface); - return UNKNOWN_STR; + return unknown_str; } for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { @@ -352,7 +350,7 @@ ip(const char *iface) if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) { if (s != 0) { warnx("Failed to get IP address for interface %s", iface); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%s", host); } @@ -360,7 +358,7 @@ ip(const char *iface) freeifaddrs(ifaddr); - return UNKNOWN_STR; + return unknown_str; } static const char * @@ -369,7 +367,7 @@ kernel_release(void) struct utsname udata; if (uname(&udata) < 0) { - return UNKNOWN_STR; + return unknown_str; } return bprintf("%s", udata.release); @@ -380,6 +378,11 @@ keyboard_indicators(void) { Display *dpy = XOpenDisplay(NULL); XKeyboardState state; + + if (dpy == NULL) { + warnx("XOpenDisplay failed"); + return unknown_str; + } XGetKeyboardControl(dpy, &state); XCloseDisplay(dpy); @@ -402,7 +405,7 @@ load_avg(void) if (getloadavg(avgs, 3) < 0) { warnx("Failed to get the load avg"); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]); @@ -417,7 +420,7 @@ num_files(const char *dir) if ((fd = opendir(dir)) == NULL) { warn("Failed to get number of files in directory %s", dir); - return UNKNOWN_STR; + return unknown_str; } while ((dp = readdir(fd)) != NULL) { @@ -441,12 +444,12 @@ ram_free(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "MemFree: %ld kB\n", &free); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%f", (float)free / 1024 / 1024); } @@ -460,7 +463,7 @@ ram_perc(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 || fscanf(fp, "MemFree: %ld kB\n", &free) != 1 || @@ -474,7 +477,7 @@ ram_perc(void) scanerr: fclose(fp); - return UNKNOWN_STR; + return unknown_str; } static const char * @@ -487,12 +490,12 @@ ram_total(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "MemTotal: %ld kB\n", &total); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%f", (float)total / 1024 / 1024); } @@ -506,7 +509,7 @@ ram_used(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 || fscanf(fp, "MemFree: %ld kB\n", &free) != 1 || @@ -520,7 +523,7 @@ ram_used(void) scanerr: fclose(fp); - return UNKNOWN_STR; + return unknown_str; } static const char * @@ -532,16 +535,16 @@ run_command(const char *cmd) fp = popen(cmd, "r"); if (fp == NULL) { warn("Failed to get command output for %s", cmd); - return UNKNOWN_STR; + return unknown_str; } p = fgets(buf, sizeof(buf) - 1, fp); pclose(fp); if (!p) - return UNKNOWN_STR; + return unknown_str; if ((p = strrchr(buf, '\n')) != NULL) p[0] = '\0'; - return buf[0] ? buf : UNKNOWN_STR; + return buf[0] ? buf : unknown_str; } static const char * @@ -555,22 +558,22 @@ swap_free(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) { warn("swap_free: read error"); fclose(fp); - return UNKNOWN_STR; + return unknown_str; } fclose(fp); if ((match = strstr(buf, "SwapTotal")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapTotal: %ld kB\n", &total); if ((match = strstr(buf, "SwapFree")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapFree: %ld kB\n", &free); return bprintf("%f", (float)free / 1024 / 1024); @@ -587,26 +590,26 @@ swap_perc(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) { warn("swap_perc: read error"); fclose(fp); - return UNKNOWN_STR; + return unknown_str; } fclose(fp); if ((match = strstr(buf, "SwapTotal")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapTotal: %ld kB\n", &total); if ((match = strstr(buf, "SwapCached")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapCached: %ld kB\n", &cached); if ((match = strstr(buf, "SwapFree")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapFree: %ld kB\n", &free); return bprintf("%d", 100 * (total - free - cached) / total); @@ -623,17 +626,17 @@ swap_total(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) { warn("swap_total: read error"); fclose(fp); - return UNKNOWN_STR; + return unknown_str; } fclose(fp); if ((match = strstr(buf, "SwapTotal")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapTotal: %ld kB\n", &total); return bprintf("%f", (float)total / 1024 / 1024); @@ -650,25 +653,25 @@ swap_used(void) fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return UNKNOWN_STR; + return unknown_str; } if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) { warn("swap_used: read error"); fclose(fp); - return UNKNOWN_STR; + return unknown_str; } fclose(fp); if ((match = strstr(buf, "SwapTotal")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapTotal: %ld kB\n", &total); if ((match = strstr(buf, "SwapCached")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapCached: %ld kB\n", &cached); if ((match = strstr(buf, "SwapFree")) == NULL) - return UNKNOWN_STR; + return unknown_str; sscanf(match, "SwapFree: %ld kB\n", &free); return bprintf("%f", (float)(total - free - cached) / 1024 / 1024); @@ -683,12 +686,12 @@ temp(const char *file) fp = fopen(file, "r"); if (fp == NULL) { warn("Failed to open file %s", file); - return UNKNOWN_STR; + return unknown_str; } n = fscanf(fp, "%d", &temp); fclose(fp); if (n != 1) - return UNKNOWN_STR; + return unknown_str; return bprintf("%d", temp / 1000); } @@ -714,7 +717,7 @@ username(void) if (pw == NULL) { warn("Failed to get username"); - return UNKNOWN_STR; + return unknown_str; } return bprintf("%s", pw->pw_name); @@ -737,20 +740,20 @@ vol_perc(const char *card) afd = open(card, O_RDONLY | O_NONBLOCK); if (afd == -1) { warn("Cannot open %s", card); - return UNKNOWN_STR; + return unknown_str; } if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) { warn("Cannot get volume for %s", card); close(afd); - return UNKNOWN_STR; + return unknown_str; } - for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) { + for (i = 0; i < LEN(vnames); i++) { if (devmask & (1 << i) && !strcmp("vol", vnames[i])) { if (ioctl(afd, MIXER_READ(i), &v) == -1) { warn("vol_perc: ioctl"); close(afd); - return UNKNOWN_STR; + return unknown_str; } } } @@ -773,18 +776,18 @@ wifi_perc(const char *iface) fp = fopen(path, "r"); if (fp == NULL) { warn("Failed to open file %s", path); - return UNKNOWN_STR; + return unknown_str; } p = fgets(status, 5, fp); fclose(fp); if(!p || strcmp(status, "up\n") != 0) { - return UNKNOWN_STR; + return unknown_str; } fp = fopen("/proc/net/wireless", "r"); if (fp == NULL) { warn("Failed to open file /proc/net/wireless"); - return UNKNOWN_STR; + return unknown_str; } for (i = 0; i < 3; i++) { @@ -793,10 +796,10 @@ wifi_perc(const char *iface) } fclose(fp); if (i < 2 || !p) - return UNKNOWN_STR; + return unknown_str; if ((datastart = strstr(buf, iface)) == NULL) - return UNKNOWN_STR; + return unknown_str; datastart = (datastart+(strlen(iface)+1)); sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc); @@ -817,28 +820,26 @@ wifi_essid(const char *iface) if (sockfd == -1) { warn("Failed to get ESSID for interface %s", iface); - return UNKNOWN_STR; + return unknown_str; } wreq.u.essid.pointer = id; if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) { warn("Failed to get ESSID for interface %s", iface); - return UNKNOWN_STR; + return unknown_str; } close(sockfd); if (strcmp(id, "") == 0) - return UNKNOWN_STR; + return unknown_str; else return id; } static void -sighandler(const int signo) +terminate(const int signo) { - if (signo == SIGTERM || signo == SIGINT) { - done = 1; - } + done = 1; } static void @@ -871,12 +872,16 @@ main(int argc, char *argv[]) } memset(&act, 0, sizeof(act)); - act.sa_handler = sighandler; - sigaction(SIGINT, &act, 0); - sigaction(SIGTERM, &act, 0); + act.sa_handler = terminate; + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); if (!sflag) { dpy = XOpenDisplay(NULL); + if (!dpy) { + fprintf(stderr, "slstatus: cannot open display"); + exit(1); + } } setlocale(LC_ALL, ""); @@ -884,8 +889,7 @@ main(int argc, char *argv[]) while (!done) { status_string[0] = '\0'; - for (element = status_string, i = len = 0; - i < sizeof(args) / sizeof(args[0]); + for (element = status_string, i = len = 0; i < LEN(args); ++i, element += len) { argument = args[i]; len = snprintf(element, sizeof(status_string)-1 - len, @@ -904,11 +908,11 @@ main(int argc, char *argv[]) XSync(dpy, False); } - if ((UPDATE_INTERVAL - delay) <= 0) { + if ((update_interval - delay) <= 0) { delay = 0; continue; } else { - sleep(UPDATE_INTERVAL - delay); + sleep(update_interval - delay); delay = 0; } }