Xinqi Bao's Git
projects
/
slstatus.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
slstatus != dmenu lol
[slstatus.git]
/
slstatus.c
diff --git
a/slstatus.c
b/slstatus.c
index
9a4831d
..
f47cd9f
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-28,6
+28,8
@@
#include "arg.h"
#include "arg.h"
+#define LEN(x) (sizeof (x) / sizeof *(x))
+
struct arg {
const char *(*func)();
const char *fmt;
struct arg {
const char *(*func)();
const char *fmt;
@@
-75,7
+77,6
@@
static void usage(void);
char *argv0;
static unsigned short int delay = 0;
static unsigned short int done;
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 Display *dpy;
#include "config.h"
@@
-109,12
+110,12
@@
battery_perc(const char *bat)
fp = fopen(path, "r");
if (fp == NULL) {
warn("Failed to open file %s", path);
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)
}
n = fscanf(fp, "%i", &perc);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return bprintf("%d", perc);
}
return bprintf("%d", perc);
}
@@
-130,12
+131,12
@@
battery_power(const char *bat)
fp = fopen(path, "r");
if (fp == NULL) {
warn("Failed to open file %s", path);
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)
}
n = fscanf(fp, "%i", &watts);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return bprintf("%d", (watts + 500000) / 1000000);
}
return bprintf("%d", (watts + 500000) / 1000000);
}
@@
-143,33
+144,38
@@
battery_power(const char *bat)
static const char *
battery_state(const char *bat)
{
static const char *
battery_state(const char *bat)
{
- char path[PATH_MAX];
- char state[12];
FILE *fp;
FILE *fp;
+ struct {
+ char *state;
+ char *symbol;
+ } map[] = {
+ { "Charging", "+" },
+ { "Discharging", "-" },
+ { "Full", "=" },
+ { "Unknown", "/" },
+ };
+ size_t i;
int n;
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);
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);
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
n = fscanf(fp, "%12s", state);
fclose(fp);
if (n != 1)
}
n = fscanf(fp, "%12s", state);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ 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 *
}
static const char *
@@
-181,12
+187,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");
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)
}
n = fscanf(fp, "%i", &freq);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return bprintf("%d", (freq + 500) / 1000);
}
return bprintf("%d", (freq + 500) / 1000);
}
@@
-201,12
+207,12
@@
cpu_perc(void)
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
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)
}
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);
delay++;
sleep(delay);
@@
-214,12
+220,12
@@
cpu_perc(void)
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
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)
}
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);
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);
@@
-232,7
+238,7
@@
datetime(const char *fmt)
t = time(NULL);
if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0)
t = time(NULL);
if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return buf;
}
return buf;
}
@@
-244,7
+250,7
@@
disk_free(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
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);
}
return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
@@
-258,7
+264,7
@@
disk_perc(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
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));
}
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
@@
-273,7
+279,7
@@
disk_total(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
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);
}
return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
@@
-286,7
+292,7
@@
disk_used(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
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);
}
return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
@@
-301,12
+307,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");
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)
}
n = fscanf(fp, "%d", &num);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return bprintf("%d", num);
}
return bprintf("%d", num);
}
@@
-322,7
+328,7
@@
hostname(void)
{
if (gethostname(buf, sizeof(buf)) == -1) {
warn("hostname");
{
if (gethostname(buf, sizeof(buf)) == -1) {
warn("hostname");
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
return buf;
}
return buf;
@@
-337,7
+343,7
@@
ip(const char *iface)
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IP address for interface %s", 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) {
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
@@
-348,7
+354,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);
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);
}
}
return bprintf("%s", host);
}
@@
-356,7
+362,7
@@
ip(const char *iface)
freeifaddrs(ifaddr);
freeifaddrs(ifaddr);
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
static const char *
}
static const char *
@@
-365,7
+371,7
@@
kernel_release(void)
struct utsname udata;
if (uname(&udata) < 0) {
struct utsname udata;
if (uname(&udata) < 0) {
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
return bprintf("%s", udata.release);
}
return bprintf("%s", udata.release);
@@
-376,6
+382,11
@@
keyboard_indicators(void)
{
Display *dpy = XOpenDisplay(NULL);
XKeyboardState state;
{
Display *dpy = XOpenDisplay(NULL);
XKeyboardState state;
+
+ if (dpy == NULL) {
+ warnx("XOpenDisplay failed");
+ return unknown_str;
+ }
XGetKeyboardControl(dpy, &state);
XCloseDisplay(dpy);
XGetKeyboardControl(dpy, &state);
XCloseDisplay(dpy);
@@
-398,7
+409,7
@@
load_avg(void)
if (getloadavg(avgs, 3) < 0) {
warnx("Failed to get the load avg");
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]);
}
return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
@@
-413,7
+424,7
@@
num_files(const char *dir)
if ((fd = opendir(dir)) == NULL) {
warn("Failed to get number of files in directory %s", 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) {
}
while ((dp = readdir(fd)) != NULL) {
@@
-437,12
+448,12
@@
ram_free(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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)
}
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);
}
return bprintf("%f", (float)free / 1024 / 1024);
}
@@
-456,7
+467,7
@@
ram_perc(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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 ||
}
if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 ||
fscanf(fp, "MemFree: %ld kB\n", &free) != 1 ||
@@
-470,7
+481,7
@@
ram_perc(void)
scanerr:
fclose(fp);
scanerr:
fclose(fp);
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
static const char *
}
static const char *
@@
-483,12
+494,12
@@
ram_total(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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)
}
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);
}
return bprintf("%f", (float)total / 1024 / 1024);
}
@@
-502,7
+513,7
@@
ram_used(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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 ||
}
if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 ||
fscanf(fp, "MemFree: %ld kB\n", &free) != 1 ||
@@
-516,7
+527,7
@@
ram_used(void)
scanerr:
fclose(fp);
scanerr:
fclose(fp);
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
static const char *
}
static const char *
@@
-528,16
+539,16
@@
run_command(const char *cmd)
fp = popen(cmd, "r");
if (fp == NULL) {
warn("Failed to get command output for %s", 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)
}
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';
if ((p = strrchr(buf, '\n')) != NULL)
p[0] = '\0';
- return buf[0] ? buf :
UNKNOWN_STR
;
+ return buf[0] ? buf :
unknown_str
;
}
static const char *
}
static const char *
@@
-551,22
+562,22
@@
swap_free(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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);
}
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)
}
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)
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);
sscanf(match, "SwapFree: %ld kB\n", &free);
return bprintf("%f", (float)free / 1024 / 1024);
@@
-583,26
+594,26
@@
swap_perc(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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);
}
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)
}
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)
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)
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);
sscanf(match, "SwapFree: %ld kB\n", &free);
return bprintf("%d", 100 * (total - free - cached) / total);
@@
-619,17
+630,17
@@
swap_total(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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);
}
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)
}
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);
sscanf(match, "SwapTotal: %ld kB\n", &total);
return bprintf("%f", (float)total / 1024 / 1024);
@@
-646,25
+657,25
@@
swap_used(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
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);
}
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)
}
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)
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)
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);
sscanf(match, "SwapFree: %ld kB\n", &free);
return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
@@
-679,12
+690,12
@@
temp(const char *file)
fp = fopen(file, "r");
if (fp == NULL) {
warn("Failed to open file %s", 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)
}
n = fscanf(fp, "%d", &temp);
fclose(fp);
if (n != 1)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
return bprintf("%d", temp / 1000);
}
return bprintf("%d", temp / 1000);
}
@@
-710,7
+721,7
@@
username(void)
if (pw == NULL) {
warn("Failed to get username");
if (pw == NULL) {
warn("Failed to get username");
- return
UNKNOWN_STR
;
+ return
unknown_str
;
}
return bprintf("%s", pw->pw_name);
}
return bprintf("%s", pw->pw_name);
@@
-733,20
+744,20
@@
vol_perc(const char *card)
afd = open(card, O_RDONLY | O_NONBLOCK);
if (afd == -1) {
warn("Cannot open %s", 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);
}
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);
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
;
}
}
}
}
}
}
@@
-769,18
+780,18
@@
wifi_perc(const char *iface)
fp = fopen(path, "r");
if (fp == NULL) {
warn("Failed to open file %s", path);
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) {
}
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");
}
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++) {
}
for (i = 0; i < 3; i++) {
@@
-789,10
+800,10
@@
wifi_perc(const char *iface)
}
fclose(fp);
if (i < 2 || !p)
}
fclose(fp);
if (i < 2 || !p)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
if ((datastart = strstr(buf, iface)) == NULL)
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);
datastart = (datastart+(strlen(iface)+1));
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc);
@@
-813,18
+824,18
@@
wifi_essid(const char *iface)
if (sockfd == -1) {
warn("Failed to get ESSID for interface %s", 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);
}
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)
}
close(sockfd);
if (strcmp(id, "") == 0)
- return
UNKNOWN_STR
;
+ return
unknown_str
;
else
return id;
}
else
return id;
}
@@
-840,51
+851,43
@@
sighandler(const int signo)
static void
usage(void)
{
static void
usage(void)
{
- fprintf(stderr, "usage: %s [-
d] [-o] [-n] [-v] [-h
]\n", argv0);
+ fprintf(stderr, "usage: %s [-
s
]\n", argv0);
exit(1);
}
int
main(int argc, char *argv[])
{
exit(1);
}
int
main(int argc, char *argv[])
{
- unsigned short int i;
- char status_string[MAXLEN];
- char *element;
struct arg argument;
struct sigaction act;
struct arg argument;
struct sigaction act;
- size_t len;
+ size_t i, len;
+ int sflag = 0;
+ char status_string[MAXLEN];
+ char *element;
ARGBEGIN {
ARGBEGIN {
- case 'd':
- dflag = 1;
- break;
- case 'o':
- oflag = 1;
+ case 's':
+ sflag = 1;
break;
break;
- case 'n':
- nflag = 1;
- break;
- case 'v':
- printf("slstatus-"VERSION"\n");
- return 0;
default:
usage();
} ARGEND
default:
usage();
} ARGEND
- if (
(dflag && oflag) || (dflag && nflag) || (oflag && nflag)
) {
+ if (
argc
) {
usage();
}
usage();
}
- 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);
memset(&act, 0, sizeof(act));
act.sa_handler = sighandler;
sigaction(SIGINT, &act, 0);
sigaction(SIGTERM, &act, 0);
- if (!
o
flag) {
+ if (!
s
flag) {
dpy = XOpenDisplay(NULL);
dpy = XOpenDisplay(NULL);
+ if (!dpy) {
+ fprintf(stderr, "slstatus: cannot open display");
+ exit(1);
+ }
}
setlocale(LC_ALL, "");
}
setlocale(LC_ALL, "");
@@
-892,8
+895,7
@@
main(int argc, char *argv[])
while (!done) {
status_string[0] = '\0';
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,
++i, element += len) {
argument = args[i];
len = snprintf(element, sizeof(status_string)-1 - len,
@@
-905,26
+907,23
@@
main(int argc, char *argv[])
}
}
}
}
- if (oflag) {
- printf("%s\n", status_string);
- } else if (nflag) {
+ if (sflag) {
printf("%s\n", status_string);
printf("%s\n", status_string);
- done = 1;
} else {
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
XSync(dpy, False);
}
} else {
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
XSync(dpy, False);
}
- if ((
UPDATE_INTERVAL
- delay) <= 0) {
+ if ((
update_interval
- delay) <= 0) {
delay = 0;
continue;
} else {
delay = 0;
continue;
} else {
- sleep(
UPDATE_INTERVAL
- delay);
+ sleep(
update_interval
- delay);
delay = 0;
}
}
delay = 0;
}
}
- if (!
o
flag) {
+ if (!
s
flag) {
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XCloseDisplay(dpy);
}
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XCloseDisplay(dpy);
}