/* See LICENSE file for copyright and license details. */
+#include <dirent.h>
#include <err.h>
#include <fcntl.h>
#include <ifaddrs.h>
#include "arg.h"
+#define LEN(x) (sizeof (x) / sizeof *(x))
+
struct arg {
const char *(*func)();
const char *fmt;
static const char *kernel_release(void);
static const char *keyboard_indicators(void);
static const char *load_avg(void);
+static const char *num_files(const char *dir);
static const char *ram_free(void);
static const char *ram_perc(void);
static const char *ram_used(void);
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(const int eval);
+static void usage(void);
char *argv0;
static unsigned short int delay = 0;
static unsigned short int done;
-static unsigned short int dflag, oflag, nflag;
static Display *dpy;
#include "config.h"
static const char *
battery_perc(const char *bat)
{
- int perc;
+ int n, perc;
char path[PATH_MAX];
FILE *fp;
warn("Failed to open file %s", path);
return UNKNOWN_STR;
}
- fscanf(fp, "%i", &perc);
+ n = fscanf(fp, "%i", &perc);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%d", perc);
}
{
char path[PATH_MAX];
FILE *fp;
- int watts;
+ int n, watts;
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
fp = fopen(path, "r");
warn("Failed to open file %s", path);
return UNKNOWN_STR;
}
- fscanf(fp, "%i", &watts);
+ n = fscanf(fp, "%i", &watts);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%d", (watts + 500000) / 1000000);
}
static const char *
battery_state(const char *bat)
{
- char path[PATH_MAX];
- char state[12];
FILE *fp;
+ struct {
+ char *state;
+ char *symbol;
+ } map[] = {
+ { "Charging", "+" },
+ { "Discharging", "-" },
+ { "Full", "=" },
+ { "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");
warn("Failed to open file %s", path);
return UNKNOWN_STR;
}
- fscanf(fp, "%12s", state);
+ n = fscanf(fp, "%12s", state);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
- if (strcmp(state, "Charging") == 0) {
- return "+";
- } else if (strcmp(state, "Discharging") == 0) {
- return "-";
- } else if (strcmp(state, "Full") == 0) {
- return "=";
- } else if (strcmp(state, "Unknown") == 0) {
- return "/";
- } else {
- return "?";
+ 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 freq;
+ int n, freq;
FILE *fp;
fp = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
warn("Failed to open file /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq");
return UNKNOWN_STR;
}
- fscanf(fp, "%i", &freq);
+ n = fscanf(fp, "%i", &freq);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%d", (freq + 500) / 1000);
}
static const char *
cpu_perc(void)
{
- int perc;
+ int n, perc;
long double a[4], b[4];
FILE *fp;
warn("Failed to open file /proc/stat");
return UNKNOWN_STR;
}
- fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
+ 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);
warn("Failed to open file /proc/stat");
return UNKNOWN_STR;
}
- fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
+ 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]));
return bprintf("%d", perc);
static const char *
entropy(void)
{
- int num;
+ int n, num;
FILE *fp;
fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
return UNKNOWN_STR;
}
- fscanf(fp, "%d", &num);
+ n = fscanf(fp, "%d", &num);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%d", num);
}
{
Display *dpy = XOpenDisplay(NULL);
XKeyboardState state;
+
+ if (dpy == NULL) {
+ warnx("XOpenDisplay failed");
+ return UNKNOWN_STR;
+ }
XGetKeyboardControl(dpy, &state);
XCloseDisplay(dpy);
return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
}
+static const char *
+num_files(const char *dir)
+{
+ struct dirent *dp;
+ DIR *fd;
+ int num = 0;
+
+ if ((fd = opendir(dir)) == NULL) {
+ warn("Failed to get number of files in directory %s", dir);
+ return UNKNOWN_STR;
+ }
+
+ while ((dp = readdir(fd)) != NULL) {
+ if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+ continue; /* skip self and parent */
+ num++;
+ }
+
+ closedir(fd);
+
+ return bprintf("%d", num);
+}
+
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;
}
- fscanf(fp, "MemFree: %ld kB\n", &free);
+ n = fscanf(fp, "MemFree: %ld kB\n", &free);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%f", (float)free / 1024 / 1024);
}
warn("Failed to open file /proc/meminfo");
return 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);
+ 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;
}
static const char *
{
long total;
FILE *fp;
+ int n;
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
return UNKNOWN_STR;
}
- fscanf(fp, "MemTotal: %ld kB\n", &total);
+ n = fscanf(fp, "MemTotal: %ld kB\n", &total);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%f", (float)total / 1024 / 1024);
}
warn("Failed to open file /proc/meminfo");
return 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);
+ 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);
+
+scanerr:
+ fclose(fp);
+ return UNKNOWN_STR;
}
static const char *
run_command(const char *cmd)
{
- char *nlptr;
+ char *p;
FILE *fp;
fp = popen(cmd, "r");
warn("Failed to get command output for %s", cmd);
return UNKNOWN_STR;
}
- fgets(buf, sizeof(buf) - 1, fp);
+ p = fgets(buf, sizeof(buf) - 1, fp);
pclose(fp);
- if ((nlptr = strrchr(buf, '\n')) != NULL)
- nlptr[0] = '\0';
+ if (!p)
+ return UNKNOWN_STR;
+ if ((p = strrchr(buf, '\n')) != NULL)
+ p[0] = '\0';
return buf[0] ? buf : UNKNOWN_STR;
}
static const char *
temp(const char *file)
{
- int temp;
+ int n, temp;
FILE *fp;
fp = fopen(file, "r");
warn("Failed to open file %s", file);
return UNKNOWN_STR;
}
- fscanf(fp, "%d", &temp);
+ n = fscanf(fp, "%d", &temp);
fclose(fp);
+ if (n != 1)
+ return UNKNOWN_STR;
return bprintf("%d", temp / 1000);
}
close(afd);
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");
static const char *
wifi_perc(const char *iface)
{
- int perc;
- char *datastart;
+ int i, perc;
+ char *p, *datastart;
char path[PATH_MAX];
char status[5];
FILE *fp;
warn("Failed to open file %s", path);
return UNKNOWN_STR;
}
- fgets(status, 5, fp);
+ p = fgets(status, 5, fp);
fclose(fp);
- if(strcmp(status, "up\n") != 0) {
+ if(!p || strcmp(status, "up\n") != 0) {
return UNKNOWN_STR;
}
return UNKNOWN_STR;
}
- fgets(buf, sizeof(buf) - 1, fp);
- fgets(buf, sizeof(buf) - 1, fp);
- fgets(buf, sizeof(buf) - 1, fp);
+ for (i = 0; i < 3; i++) {
+ if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
+ break;
+ }
fclose(fp);
+ if (i < 2 || !p)
+ return UNKNOWN_STR;
if ((datastart = strstr(buf, iface)) == NULL)
return UNKNOWN_STR;
}
static void
-usage(const int eval)
+usage(void)
{
- fprintf(stderr, "usage: %s [-d] [-o] [-n] [-v] [-h]\n", argv0);
- exit(eval);
+ fprintf(stderr, "usage: %s [-s]\n", argv0);
+ exit(1);
}
int
main(int argc, char *argv[])
{
- unsigned short int i;
- char status_string[MAXLEN];
- char *element;
struct arg argument;
struct sigaction act;
- size_t len;
+ size_t i, len;
+ int sflag = 0;
+ char status_string[MAXLEN];
+ char *element;
ARGBEGIN {
- case 'd':
- dflag = 1;
- break;
- case 'o':
- oflag = 1;
- break;
- case 'n':
- nflag = 1;
+ case 's':
+ sflag = 1;
break;
- case 'v':
- printf("slstatus (C) 2016-2017 slstatus engineers\n");
- return 0;
- case 'h':
- usage(0);
default:
- usage(1);
+ usage();
} ARGEND
- if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) {
- usage(1);
- }
- if (dflag && daemon(1, 1) < 0) {
- err(1, "daemon");
+ if (argc) {
+ usage();
}
memset(&act, 0, sizeof(act));
sigaction(SIGINT, &act, 0);
sigaction(SIGTERM, &act, 0);
- if (!oflag) {
+ if (!sflag) {
dpy = XOpenDisplay(NULL);
+ if (!dpy) {
+ fprintf(stderr, "slstatus: cannot open display");
+ exit(1);
+ }
}
setlocale(LC_ALL, "");
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,
}
}
- if (oflag) {
- printf("%s\n", status_string);
- } else if (nflag) {
+ if (sflag) {
printf("%s\n", status_string);
- done = 1;
} else {
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
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;
}
}
- if (!oflag) {
+ if (!sflag) {
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XCloseDisplay(dpy);
}