X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/561de544e74487f5e7a9b51850d382fe2278a915..b11dd2db0ebfc0b20ef2d5a972f13cf39bdd0b31:/slstatus.c diff --git a/slstatus.c b/slstatus.c index a13bf3b..53e1946 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 @@ -17,56 +17,61 @@ #include #include #include +#include #include #include +#include #include #include #include -#undef strlcat -#undef strlcpy - -#include "strlcat.h" -#include "strlcpy.h" -#include "concat.h" - -char concat[]; +#include "arg.h" struct arg { char *(*func)(); - const char *format; + const char *fmt; const char *args; }; -static char *smprintf(const char *, ...); -static char *battery_perc(const char *); -static char *battery_state(const char *); +static char *smprintf(const char *fmt, ...); +static char *battery_perc(const char *bat); +static char *battery_state(const char *bat); static char *cpu_perc(void); -static char *datetime(const char *); -static char *disk_free(const char *); -static char *disk_perc(const char *); -static char *disk_total(const char *); -static char *disk_used(const char *); +static char *datetime(const char *fmt); +static char *disk_free(const char *mnt); +static char *disk_perc(const char *mnt); +static char *disk_total(const char *mnt); +static char *disk_used(const char *mnt); static char *entropy(void); static char *gid(void); static char *hostname(void); -static char *ip(const char *); +static char *ip(const char *iface); +static char *kernel_release(void); +static char *keyboard_indicators(void); static char *load_avg(void); static char *ram_free(void); static char *ram_perc(void); static char *ram_used(void); static char *ram_total(void); -static char *run_command(const char *); -static char *temp(const char *); +static char *run_command(const char *cmd); +static char *swap_free(void); +static char *swap_perc(void); +static char *swap_used(void); +static char *swap_total(void); +static char *temp(const char *file); static char *uid(void); static char *uptime(void); static char *username(void); -static char *vol_perc(const char *); -static char *wifi_perc(const char *); -static char *wifi_essid(const char *); -static void sighandler(const int); - -static unsigned short int delay, done; +static char *vol_perc(const char *card); +static char *wifi_perc(const char *iface); +static char *wifi_essid(const char *iface); +static void sighandler(const int signo); +static void usage(const int eval); + +char *argv0; +static unsigned short int delay = 0; +static unsigned short int done; +static unsigned short int dflag, oflag; static Display *dpy; #include "config.h" @@ -84,8 +89,7 @@ smprintf(const char *fmt, ...) ret = malloc(++len); if (ret == NULL) { - perror("malloc"); - exit(1); + err(1, "malloc"); } va_start(ap, fmt); @@ -96,16 +100,17 @@ smprintf(const char *fmt, ...) } static char * -battery_perc(const char *battery) +battery_perc(const char *bat) { int perc; + char path[PATH_MAX]; FILE *fp; - ccat(3, "/sys/class/power_supply/", battery, "/capacity"); - fp = fopen(concat, "r"); + snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity"); + fp = fopen(path, "r"); if (fp == NULL) { - warn("Error opening battery file: %s", concat); - return smprintf(UNKNOWN_STR); + warn("Failed to open file %s", path); + return smprintf("%s", UNKNOWN_STR); } fscanf(fp, "%i", &perc); fclose(fp); @@ -114,28 +119,30 @@ battery_perc(const char *battery) } static char * -battery_state(const char *battery) +battery_state(const char *bat) { - char state[12]; + char path[PATH_MAX]; + char state[12]; FILE *fp; - ccat(3, "/sys/class/power_supply/", battery, "/status"); - fp = fopen(concat, "r"); + snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status"); + fp = fopen(path, "r"); if (fp == NULL) { - warn("Error opening battery file: %s", concat); - return smprintf(UNKNOWN_STR); + warn("Failed to open file %s", path); + return smprintf("%s", UNKNOWN_STR); } fscanf(fp, "%12s", state); fclose(fp); - if (strcmp(state, "Charging") == 0) + if (strcmp(state, "Charging") == 0) { return smprintf("+"); - else if (strcmp(state, "Discharging") == 0) + } else if (strcmp(state, "Discharging") == 0) { return smprintf("-"); - else if (strcmp(state, "Full") == 0) + } else if (strcmp(state, "Full") == 0) { return smprintf("="); - else + } else { return smprintf("?"); + } } static char * @@ -143,67 +150,67 @@ cpu_perc(void) { int perc; long double a[4], b[4]; - FILE *fp = fopen("/proc/stat","r"); + FILE *fp; + fp = fopen("/proc/stat", "r"); if (fp == NULL) { - warn("Error opening stat file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/stat"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]); fclose(fp); - delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1)); + delay++; sleep(delay); - fp = fopen("/proc/stat","r"); + fp = fopen("/proc/stat", "r"); if (fp == NULL) { - warn("Error opening stat file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/stat"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]); fclose(fp); - 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 smprintf("%d%%", perc); } static char * -datetime(const char *timeformat) +datetime(const char *fmt) { time_t t; - char timestr[80]; + char str[80]; t = time(NULL); - if (strftime(timestr, sizeof(timestr), timeformat, localtime(&t)) == 0) - return smprintf(UNKNOWN_STR); + if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) { + return smprintf("%s", UNKNOWN_STR); + } - return smprintf("%s", timestr); + return smprintf("%s", str); } static char * -disk_free(const char *mountpoint) +disk_free(const char *mnt) { struct statvfs fs; - if (statvfs(mountpoint, &fs) < 0) { - warn("Could not get filesystem info"); - return smprintf(UNKNOWN_STR); + if (statvfs(mnt, &fs) < 0) { + warn("Failed to get filesystem info"); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024); } static char * -disk_perc(const char *mountpoint) +disk_perc(const char *mnt) { - int perc = 0; + int perc; struct statvfs fs; - if (statvfs(mountpoint, &fs) < 0) { - warn("Could not get filesystem info"); - return smprintf(UNKNOWN_STR); + if (statvfs(mnt, &fs) < 0) { + warn("Failed to get filesystem info"); + return smprintf("%s", UNKNOWN_STR); } perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); @@ -212,26 +219,26 @@ disk_perc(const char *mountpoint) } static char * -disk_total(const char *mountpoint) +disk_total(const char *mnt) { struct statvfs fs; - if (statvfs(mountpoint, &fs) < 0) { - warn("Could not get filesystem info"); - return smprintf(UNKNOWN_STR); + if (statvfs(mnt, &fs) < 0) { + warn("Failed to get filesystem info"); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024); } static char * -disk_used(const char *mountpoint) +disk_used(const char *mnt) { struct statvfs fs; - if (statvfs(mountpoint, &fs) < 0) { - warn("Could not get filesystem info"); - return smprintf(UNKNOWN_STR); + if (statvfs(mnt, &fs) < 0) { + warn("Failed to get filesystem info"); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024); @@ -240,18 +247,18 @@ disk_used(const char *mountpoint) static char * entropy(void) { - int entropy = 0; - FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"); + int num; + FILE *fp; + fp= fopen("/proc/sys/kernel/random/entropy_avail", "r"); if (fp == NULL) { - warn("Could not open entropy file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/sys/kernel/random/entropy_avail"); + return smprintf("%s", UNKNOWN_STR); } - - fscanf(fp, "%d", &entropy); + fscanf(fp, "%d", &num); fclose(fp); - return smprintf("%d", entropy); + return smprintf("%d", num); } static char * @@ -263,44 +270,37 @@ gid(void) static char * hostname(void) { - char hostname[HOST_NAME_MAX]; - FILE *fp = fopen("/proc/sys/kernel/hostname", "r"); + char buf[HOST_NAME_MAX]; - if (fp == NULL) { - warn("Could not open hostname file"); - return smprintf(UNKNOWN_STR); + if (gethostname(buf, sizeof(buf)) == -1) { + warn("hostname"); + return smprintf("%s", UNKNOWN_STR); } - fgets(hostname, sizeof(hostname), fp); - hostname[strlen(hostname)-1] = '\0'; - fclose(fp); - - return smprintf("%s", hostname); + return smprintf("%s", buf); } static char * -ip(const char *interface) +ip(const char *iface) { struct ifaddrs *ifaddr, *ifa; int s; char host[NI_MAXHOST]; if (getifaddrs(&ifaddr) == -1) { - warn("Error getting IP address"); - return smprintf(UNKNOWN_STR); + warn("Failed to get IP address for interface %s", iface); + return smprintf("%s", UNKNOWN_STR); } for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if (ifa->ifa_addr == NULL) + if (ifa->ifa_addr == NULL) { continue; - - s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, - NULL, 0, NI_NUMERICHOST); - - if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) { + } + 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("Error getting IP address."); - return smprintf(UNKNOWN_STR); + warnx("Failed to get IP address for interface %s", iface); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%s", host); } @@ -308,7 +308,42 @@ ip(const char *interface) freeifaddrs(ifaddr); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); +} + +static char * +kernel_release(void) +{ + struct utsname udata; + + if (uname(&udata) < 0) { + return smprintf(UNKNOWN_STR); + } + + return smprintf("%s", udata.release); +} + +static char * +keyboard_indicators(void) +{ + Display *dpy = XOpenDisplay(NULL); + XKeyboardState state; + XGetKeyboardControl(dpy, &state); + XCloseDisplay(dpy); + + switch (state.led_mask) { + case 1: + return smprintf("c"); + break; + case 2: + return smprintf("n"); + break; + case 3: + return smprintf("cn"); + break; + default: + return smprintf(""); + } } static char * @@ -317,8 +352,8 @@ load_avg(void) double avgs[3]; if (getloadavg(avgs, 3) < 0) { - warnx("Error getting load avg."); - return smprintf(UNKNOWN_STR); + warnx("Failed to get the load avg"); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]); @@ -328,13 +363,13 @@ static char * ram_free(void) { long free; - FILE *fp = fopen("/proc/meminfo", "r"); + FILE *fp; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Error opening meminfo file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "MemFree: %ld kB\n", &free); fclose(fp); @@ -344,37 +379,34 @@ ram_free(void) static char * ram_perc(void) { - int perc; long total, free, buffers, cached; - FILE *fp = fopen("/proc/meminfo", "r"); + FILE *fp; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Error opening meminfo file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "MemTotal: %ld kB\n", &total); fscanf(fp, "MemFree: %ld kB\n", &free); fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers); fscanf(fp, "Cached: %ld kB\n", &cached); - fclose(fp); - perc = 100 * ((total - free) - (buffers + cached)) / total; - return smprintf("%d%%", perc); + return smprintf("%d%%", 100 * ((total - free) - (buffers + cached)) / total); } static char * ram_total(void) { long total; - FILE *fp = fopen("/proc/meminfo", "r"); + FILE *fp; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Error opening meminfo file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "MemTotal: %ld kB\n", &total); fclose(fp); @@ -384,72 +416,226 @@ ram_total(void) static char * ram_used(void) { - long free, total, buffers, cached, used; - FILE *fp = fopen("/proc/meminfo", "r"); + long free, total, buffers, cached; + FILE *fp; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Error opening meminfo file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "MemTotal: %ld kB\n", &total); fscanf(fp, "MemFree: %ld kB\n", &free); fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers); fscanf(fp, "Cached: %ld kB\n", &cached); + fclose(fp); + + return smprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024); +} + +static char * +run_command(const char *cmd) +{ + char *nlptr; + FILE *fp; + char buf[1024] = UNKNOWN_STR; + + fp = popen(cmd, "r"); + if (fp == NULL) { + warn("Failed to get command output for %s", cmd); + return smprintf("%s", UNKNOWN_STR); + } + fgets(buf, sizeof(buf), fp); + pclose(fp); + buf[sizeof(buf)] = '\0'; + if ((nlptr = strstr(buf, "\n")) != NULL) { + nlptr[0] = '\0'; + } + + return smprintf("%s", buf); +} + +static char * +swap_free(void) +{ + long total, free; + FILE *fp; + char buf[2048]; + size_t bytes_read; + char *match; + + fp = fopen("/proc/meminfo", "r"); + if (fp == NULL) { + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); + } + + if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) { + warn("swap_free: read error"); + fclose(fp); + return smprintf("%s", UNKNOWN_STR); + } + + buf[bytes_read] = '\0'; fclose(fp); - used = total - free - buffers - cached; - return smprintf("%f", (float)used / 1024 / 1024); + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapTotal: %ld kB\n", &total); + + if ((match = strstr(buf, "SwapFree")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapFree: %ld kB\n", &free); + + return smprintf("%f", (float)free / 1024 / 1024); } static char * -run_command(const char* command) +swap_perc(void) { - FILE *fp = popen(command, "r"); - char buffer[64] = '\0'; + long total, free, cached; + FILE *fp; + char buf[2048]; + size_t bytes_read; + char *match; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Could not get command output for: %s", command); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); } - fgets(buffer, sizeof(buffer), fp); - buffer[sizeof(buffer)-1] = '\0'; + if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) { + warn("swap_perc: read error"); + fclose(fp); + return smprintf("%s", UNKNOWN_STR); + } - pclose(fp); - return smprintf("%s", buffer); + buf[bytes_read] = '\0'; + fclose(fp); + + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapTotal: %ld kB\n", &total); + + if ((match = strstr(buf, "SwapCached")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapCached: %ld kB\n", &cached); + + if ((match = strstr(buf, "SwapFree")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapFree: %ld kB\n", &free); + + return smprintf("%d%%", 100 * (total - free - cached) / total); } static char * -temp(const char *file) +swap_total(void) { - int temperature; - FILE *fp = fopen(file, "r"); + long total; + FILE *fp; + char buf[2048]; + size_t bytes_read; + char *match; + fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { - warn("Could not open temperature file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); + } + if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) { + warn("swap_total: read error"); + fclose(fp); + return smprintf("%s", UNKNOWN_STR); + } + + buf[bytes_read] = '\0'; + fclose(fp); + + 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); +} + +static char * +swap_used(void) +{ + long total, free, cached; + FILE *fp; + char buf[2048]; + size_t bytes_read; + char *match; + + fp = fopen("/proc/meminfo", "r"); + if (fp == NULL) { + warn("Failed to open file /proc/meminfo"); + return smprintf("%s", UNKNOWN_STR); + } + if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) { + warn("swap_used: read error"); + fclose(fp); + return smprintf("%s", UNKNOWN_STR); } - fscanf(fp, "%d", &temperature); + buf[bytes_read] = '\0'; fclose(fp); - return smprintf("%d°C", temperature / 1000); + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapTotal: %ld kB\n", &total); + + if ((match = strstr(buf, "SwapCached")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapCached: %ld kB\n", &cached); + + if ((match = strstr(buf, "SwapFree")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } + sscanf(match, "SwapFree: %ld kB\n", &free); + + return smprintf("%f", (float)(total - free - cached) / 1024 / 1024); +} + +static char * +temp(const char *file) +{ + int temp; + FILE *fp; + + fp = fopen(file, "r"); + if (fp == NULL) { + warn("Failed to open file %s", file); + return smprintf("%s", UNKNOWN_STR); + } + fscanf(fp, "%d", &temp); + fclose(fp); + + return smprintf("%d°C", temp / 1000); } static char * uptime(void) { struct sysinfo info; - int hours = 0; - int minutes = 0; + int h = 0; + int m = 0; sysinfo(&info); - hours = info.uptime / 3600; - minutes = (info.uptime - hours * 3600 ) / 60; + h = info.uptime / 3600; + m = (info.uptime - h * 3600 ) / 60; - return smprintf("%dh %dm", hours, minutes); + return smprintf("%dh %dm", h, m); } static char * @@ -459,8 +645,8 @@ username(void) struct passwd *pw = getpwuid(uid); if (pw == NULL) { - warn("Could not get username"); - return smprintf(UNKNOWN_STR); + warn("Failed to get username"); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%s", pw->pw_name); @@ -474,85 +660,76 @@ uid(void) static char * -vol_perc(const char *soundcard) +vol_perc(const char *card) { - long int vol, max, min; - snd_mixer_t *handle; - snd_mixer_elem_t *elem; - snd_mixer_selem_id_t *s_elem; - - snd_mixer_open(&handle, 0); - snd_mixer_attach(handle, soundcard); - snd_mixer_selem_register(handle, NULL, NULL); - snd_mixer_load(handle); - snd_mixer_selem_id_malloc(&s_elem); - snd_mixer_selem_id_set_name(s_elem, "Master"); - elem = snd_mixer_find_selem(handle, s_elem); + unsigned int i; + int v, afd, devmask; + char *vnames[] = SOUND_DEVICE_NAMES; - if (elem == NULL) { - snd_mixer_selem_id_free(s_elem); - snd_mixer_close(handle); - warn("Failed to get volume percentage for: %s", soundcard); + afd = open(card, O_RDONLY); + if (afd < 0) { + warn("Cannot open %s", card); return smprintf(UNKNOWN_STR); } - snd_mixer_handle_events(handle); - snd_mixer_selem_get_playback_volume_range(elem, &min, &max); - snd_mixer_selem_get_playback_volume(elem, 0, &vol); + ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask); + for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) { + if (devmask & (1 << i)) { + if (!strcmp("vol", vnames[i])) { + ioctl(afd, MIXER_READ(i), &v); + } + } + } - snd_mixer_selem_id_free(s_elem); - snd_mixer_close(handle); + close(afd); - return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max)); + return smprintf("%d%%", v & 0xff); } static char * -wifi_perc(const char *wificard) +wifi_perc(const char *iface) { - int strength; + int perc; char buf[255]; char *datastart; + char path[PATH_MAX]; char status[5]; FILE *fp; - ccat(3, "/sys/class/net/", wificard, "/operstate"); - - fp = fopen(concat, "r"); - + snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate"); + fp = fopen(path, "r"); if (fp == NULL) { - warn("Error opening wifi operstate file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file %s", path); + return smprintf("%s", UNKNOWN_STR); } - fgets(status, 5, fp); fclose(fp); - if(strcmp(status, "up\n") != 0) - return smprintf(UNKNOWN_STR); + if(strcmp(status, "up\n") != 0) { + return smprintf("%s", UNKNOWN_STR); + } fp = fopen("/proc/net/wireless", "r"); if (fp == NULL) { - warn("Error opening wireless file"); - return smprintf(UNKNOWN_STR); + warn("Failed to open file /proc/net/wireless"); + return smprintf("%s", UNKNOWN_STR); } - ccat(2, wificard, ":"); fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp); + fclose(fp); - datastart = strstr(buf, concat); - if (datastart != NULL) { - datastart = strstr(buf, ":"); - sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &strength); + if ((datastart = strstr(buf, iface)) == NULL) { + return smprintf("%s", UNKNOWN_STR); } + datastart = (datastart+(strlen(iface)+1)); + sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc); - fclose(fp); - - return smprintf("%d%%", strength); + return smprintf("%d%%", perc); } static char * -wifi_essid(const char *wificard) +wifi_essid(const char *iface) { char id[IW_ESSID_MAX_SIZE+1]; int sockfd = socket(AF_INET, SOCK_DGRAM, 0); @@ -560,21 +737,22 @@ wifi_essid(const char *wificard) memset(&wreq, 0, sizeof(struct iwreq)); wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; - sprintf(wreq.ifr_name, wificard); + snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface); + if (sockfd == -1) { - warn("Cannot open socket for interface: %s", wificard); - return smprintf(UNKNOWN_STR); + warn("Failed to get ESSID for interface %s", iface); + return smprintf("%s", UNKNOWN_STR); } wreq.u.essid.pointer = id; if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) { - warn("Get ESSID ioctl failed for interface %s", wificard); - return smprintf(UNKNOWN_STR); + warn("Failed to get ESSID for interface %s", iface); + return smprintf("%s", UNKNOWN_STR); } close(sockfd); if (strcmp((char *)wreq.u.essid.pointer, "") == 0) - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); else return smprintf("%s", (char *)wreq.u.essid.pointer); } @@ -582,57 +760,101 @@ wifi_essid(const char *wificard) static void sighandler(const int signo) { - if (signo == SIGTERM || signo == SIGINT) + if (signo == SIGTERM || signo == SIGINT) { done = 1; + } +} + +static void +usage(const int eval) +{ + fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0); + exit(eval); } int -main(void) +main(int argc, char *argv[]) { unsigned short int i; - char status_string[4096]; + char status_string[2048]; char *res, *element; struct arg argument; struct sigaction act; + ARGBEGIN { + case 'd': + dflag = 1; + break; + case 'o': + oflag = 1; + break; + case 'v': + printf("slstatus (C) 2016-2017 slstatus engineers\n"); + return 0; + case 'h': + usage(0); + default: + usage(1); + } ARGEND + + if (dflag && oflag) { + usage(1); + } + if (dflag && daemon(1, 1) < 0) { + err(1, "daemon"); + } + memset(&act, 0, sizeof(act)); act.sa_handler = sighandler; sigaction(SIGINT, &act, 0); sigaction(SIGTERM, &act, 0); - dpy = XOpenDisplay(NULL); + if (!oflag) { + dpy = XOpenDisplay(NULL); + } + + setlocale(LC_ALL, ""); while (!done) { status_string[0] = '\0'; + for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { argument = args[i]; - if (argument.args == NULL) + if (argument.args == NULL) { res = argument.func(); - else + } else { res = argument.func(argument.args); - element = smprintf(argument.format, res); + } + element = smprintf(argument.fmt, res); if (element == NULL) { - element = smprintf(UNKNOWN_STR); - warnx("Failed to format output."); + element = smprintf("%s", UNKNOWN_STR); + warnx("Failed to format output"); } - strlcat(status_string, element, sizeof(status_string)); + strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1); free(res); free(element); } - XStoreName(dpy, DefaultRootWindow(dpy), status_string); - XSync(dpy, False); - /* - * subtract delay time spend in function - * calls from the actual global delay time - */ - sleep(UPDATE_INTERVAL - delay); - delay = 0; - } - XStoreName(dpy, DefaultRootWindow(dpy), NULL); - XSync(dpy, False); + if (!oflag) { + XStoreName(dpy, DefaultRootWindow(dpy), status_string); + XSync(dpy, False); + } else { + printf("%s\n", status_string); + } - XCloseDisplay(dpy); + if ((UPDATE_INTERVAL - delay) <= 0) { + delay = 0; + continue; + } else { + sleep(UPDATE_INTERVAL - delay); + delay = 0; + } + } + + if (!oflag) { + XStoreName(dpy, DefaultRootWindow(dpy), NULL); + XCloseDisplay(dpy); + } return 0; }