X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/3468a6e368974ea222ab81c389e0800748541c42..8f5219b6dab5a1c9b7f92362a34aacfd393fa0e4:/slstatus.c diff --git a/slstatus.c b/slstatus.c index cd6cc8f..d0d1767 100644 --- a/slstatus.c +++ b/slstatus.c @@ -1,11 +1,11 @@ /* See LICENSE file for copyright and license details. */ #include #include +#include #include #include #include #include -#include #include #include #include @@ -48,7 +48,8 @@ static const char *disk_used(const char *mnt); static const char *entropy(void); static const char *gid(void); static const char *hostname(void); -static const char *ip(const char *iface); +static const char *ipv4(const char *iface); +static const char *ipv6(const char *iface); static const char *kernel_release(void); static const char *keyboard_indicators(void); static const char *load_avg(void); @@ -71,7 +72,6 @@ static const char *wifi_perc(const char *iface); static const char *wifi_essid(const char *iface); char *argv0; -static unsigned short int delay = 0; static unsigned short int done; static Display *dpy; @@ -95,52 +95,50 @@ bprintf(const char *fmt, ...) return buf; } -static const char * -battery_perc(const char *bat) +int +pscanf(const char *path, const char *fmt, ...) { - int n, perc; - char path[PATH_MAX]; FILE *fp; + va_list ap; + int n; - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity"); - fp = fopen(path, "r"); - if (fp == NULL) { - warn("Failed to open file %s", path); - return unknown_str; + if (!(fp = fopen(path, "r"))) { + warn("fopen %s: %s\n", path, strerror(errno)); + return -1; } - n = fscanf(fp, "%i", &perc); + va_start(ap, fmt); + n = vfscanf(fp, fmt, ap); + va_end(ap); fclose(fp); - if (n != 1) - return unknown_str; - return bprintf("%d", perc); + return (n == EOF) ? -1 : n; +} + +static const char * +battery_perc(const char *bat) +{ + int perc; + char path[PATH_MAX]; + + snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity"); + return (pscanf(path, "%i", &perc) == 1) ? + bprintf("%d", perc) : unknown_str; } static const char * battery_power(const char *bat) { + int watts; char path[PATH_MAX]; - FILE *fp; - int n, watts; snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now"); - fp = fopen(path, "r"); - if (fp == NULL) { - warn("Failed to open file %s", path); - return unknown_str; - } - n = fscanf(fp, "%i", &watts); - fclose(fp); - if (n != 1) - return unknown_str; - - return bprintf("%d", (watts + 500000) / 1000000); + return (pscanf(path, "%i", &watts) == 1) ? + bprintf("%d", (watts + 500000) / 1000000) : unknown_str; } static const char * battery_state(const char *bat) { - FILE *fp; struct { char *state; char *symbol; @@ -151,79 +149,55 @@ battery_state(const char *bat) { "Unknown", "/" }, }; size_t i; - int n; char path[PATH_MAX], state[12]; snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status"); - fp = fopen(path, "r"); - if (fp == NULL) { - warn("Failed to open file %s", path); + if (pscanf(path, "%12s", state) != 1) { return unknown_str; } - n = fscanf(fp, "%12s", state); - fclose(fp); - if (n != 1) - return unknown_str; for (i = 0; i < LEN(map); i++) { if (!strcmp(map[i].state, state)) { break; } } - return (i == LEN(map)) ? "?" : map[i].symbol; } static const char * cpu_freq(void) { - int n, freq; - FILE *fp; - - 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; - } - n = fscanf(fp, "%i", &freq); - fclose(fp); - if (n != 1) - return unknown_str; + int freq; - return bprintf("%d", (freq + 500) / 1000); + return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", + "%i", &freq) == 1) ? + bprintf("%d", (freq + 500) / 1000) : unknown_str; } static const char * cpu_perc(void) { - int n, perc; + struct timespec delay; + int perc; long double a[4], b[4]; - FILE *fp; - fp = fopen("/proc/stat", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/stat"); + if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], + &a[3]) != 4) { 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; - delay++; - sleep(delay); + delay.tv_sec = (interval / 2) / 1000; + delay.tv_nsec = ((interval / 2) % 1000) * 1000000; + nanosleep(&delay, NULL); - fp = fopen("/proc/stat", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/stat"); + if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], + &b[3]) != 4) { 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; - 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 bprintf("%d", perc); } @@ -297,20 +271,10 @@ disk_used(const char *mnt) static const char * entropy(void) { - int n, num; - FILE *fp; + int num; - 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; - } - n = fscanf(fp, "%d", &num); - fclose(fp); - if (n != 1) - return unknown_str; - - return bprintf("%d", num); + return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ? + bprintf("%d", num) : unknown_str; } static const char * @@ -331,14 +295,14 @@ hostname(void) } static const char * -ip(const char *iface) +ipv4(const char *iface) { struct ifaddrs *ifaddr, *ifa; int s; char host[NI_MAXHOST]; if (getifaddrs(&ifaddr) == -1) { - warn("Failed to get IP address for interface %s", iface); + warn("Failed to get IPv4 address for interface %s", iface); return unknown_str; } @@ -349,7 +313,38 @@ ip(const char *iface) s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); 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); + warnx("Failed to get IPv4 address for interface %s", iface); + return unknown_str; + } + return bprintf("%s", host); + } + } + + freeifaddrs(ifaddr); + + return unknown_str; +} + +static const char * +ipv6(const char *iface) +{ + struct ifaddrs *ifaddr, *ifa; + int s; + char host[NI_MAXHOST]; + + if (getifaddrs(&ifaddr) == -1) { + warn("Failed to get IPv6 address for interface %s", iface); + return unknown_str; + } + + for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { + if (ifa->ifa_addr == NULL) { + continue; + } + s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) { + if (s != 0) { + warnx("Failed to get IPv6 address for interface %s", iface); return unknown_str; } return bprintf("%s", host); @@ -438,92 +433,48 @@ static const char * ram_free(void) { long free; - FILE *fp; - int n; - fp = fopen("/proc/meminfo", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/meminfo"); - return unknown_str; - } - n = fscanf(fp, "MemFree: %ld kB\n", &free); - fclose(fp); - if (n != 1) - return unknown_str; - - return bprintf("%f", (float)free / 1024 / 1024); + return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ? + bprintf("%f", (float)free / 1024 / 1024) : unknown_str; } static const char * ram_perc(void) { long total, free, buffers, cached; - FILE *fp; - fp = fopen("/proc/meminfo", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/meminfo"); - return unknown_str; - } - if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 || - fscanf(fp, "MemFree: %ld kB\n", &free) != 1 || - fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", - &buffers, &buffers) != 2 || - fscanf(fp, "Cached: %ld kB\n", &cached) != 1) - goto scanerr; - fclose(fp); - - return bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total); - -scanerr: - fclose(fp); - return unknown_str; + return (pscanf("/proc/meminfo", + "MemTotal: %ld kB\n" + "MemFree: %ld kB\n" + "MemAvailable: %ld kB\nBuffers: %ld kB\n" + "Cached: %ld kB\n", + &total, &free, &buffers, &buffers, &cached) == 5) ? + bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) : + unknown_str; } static const char * ram_total(void) { long total; - FILE *fp; - int n; - - fp = fopen("/proc/meminfo", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/meminfo"); - return unknown_str; - } - n = fscanf(fp, "MemTotal: %ld kB\n", &total); - fclose(fp); - if (n != 1) - return unknown_str; - return bprintf("%f", (float)total / 1024 / 1024); + return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ? + bprintf("%f", (float)total / 1024 / 1024) : unknown_str; } static const char * ram_used(void) { - long free, total, buffers, cached; - FILE *fp; - - fp = fopen("/proc/meminfo", "r"); - if (fp == NULL) { - warn("Failed to open file /proc/meminfo"); - return unknown_str; - } - if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 || - fscanf(fp, "MemFree: %ld kB\n", &free) != 1 || - fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", - &buffers, &buffers) != 2 || - fscanf(fp, "Cached: %ld kB\n", &cached) != 1) - goto scanerr; - fclose(fp); - - return bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024); + long total, free, buffers, cached; -scanerr: - fclose(fp); - return unknown_str; + return (pscanf("/proc/meminfo", + "MemTotal: %ld kB\n" + "MemFree: %ld kB\n" + "MemAvailable: %ld kB\nBuffers: %ld kB\n" + "Cached: %ld kB\n", + &total, &free, &buffers, &buffers, &cached) == 5) ? + bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) : + unknown_str; } static const char * @@ -680,20 +631,10 @@ swap_used(void) static const char * temp(const char *file) { - int n, temp; - FILE *fp; + int temp; - fp = fopen(file, "r"); - if (fp == NULL) { - warn("Failed to open file %s", file); - return unknown_str; - } - n = fscanf(fp, "%d", &temp); - fclose(fp); - if (n != 1) - return unknown_str; - - return bprintf("%d", temp / 1000); + return (pscanf(file, "%d", &temp) == 1) ? + bprintf("%d", temp / 1000) : unknown_str; } static const char * @@ -842,6 +783,14 @@ terminate(const int signo) done = 1; } +static void +difftimespec(struct timespec *res, struct timespec *a, struct timespec *b) +{ + res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec); + res->tv_nsec = a->tv_nsec - b->tv_nsec + + (a->tv_nsec < b->tv_nsec) * 1000000000; +} + static void usage(void) { @@ -852,12 +801,11 @@ usage(void) int main(int argc, char *argv[]) { - struct arg argument; struct sigaction act; + struct timespec start, current, diff, intspec, wait; size_t i, len; int sflag = 0; - char status_string[MAXLEN]; - char *element; + char status[MAXLEN]; ARGBEGIN { case 's': @@ -876,44 +824,42 @@ main(int argc, char *argv[]) sigaction(SIGINT, &act, NULL); sigaction(SIGTERM, &act, NULL); - if (!sflag) { - dpy = XOpenDisplay(NULL); - if (!dpy) { - fprintf(stderr, "slstatus: cannot open display"); - exit(1); - } + if (!sflag && !(dpy = XOpenDisplay(NULL))) { + fprintf(stderr, "slstatus: cannot open display"); + return 1; } - setlocale(LC_ALL, ""); - while (!done) { - status_string[0] = '\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, - argument.fmt, - argument.func(argument.args)); - if (len >= sizeof(status_string)) { - status_string[sizeof(status_string)-1] = '\0'; - break; + clock_gettime(CLOCK_MONOTONIC, &start); + + status[0] = '\0'; + for (i = len = 0; i < LEN(args); i++) { + len += snprintf(status + len, sizeof(status) - len, + args[i].fmt, args[i].func(args[i].args)); + + if (len >= sizeof(status)) { + status[sizeof(status) - 1] = '\0'; } } if (sflag) { - printf("%s\n", status_string); + printf("%s\n", status); } else { - XStoreName(dpy, DefaultRootWindow(dpy), status_string); + XStoreName(dpy, DefaultRootWindow(dpy), status); XSync(dpy, False); } - if ((update_interval - delay) <= 0) { - delay = 0; - continue; - } else { - sleep(update_interval - delay); - delay = 0; + if (!done) { + clock_gettime(CLOCK_MONOTONIC, ¤t); + difftimespec(&diff, ¤t, &start); + + intspec.tv_sec = interval / 1000; + intspec.tv_nsec = (interval % 1000) * 1000000; + difftimespec(&wait, &intspec, &diff); + + if (wait.tv_sec >= 0) { + nanosleep(&wait, NULL); + } } }