X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/c5ace949e42d5c32584c66b4757ac30bf23729ff..2994a8d0ba51c8afe889728617b30db351bfd82a:/slstatus.c
diff --git a/slstatus.c b/slstatus.c
index f6e8339..6a338f9 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -6,6 +6,7 @@
#include <ifaddrs.h>
#include <limits.h>
#include <linux/wireless.h>
+#include <locale.h>
#include <netdb.h>
#include <pwd.h>
#include <signal.h>
@@ -19,6 +20,7 @@
#include <sys/socket.h>
#include <sys/sysinfo.h>
#include <sys/types.h>
+#include <sys/utsname.h>
#include <time.h>
#include <unistd.h>
#include <X11/Xlib.h>
@@ -28,7 +30,6 @@
#include "extern/arg.h"
#include "extern/strlcat.h"
-#include "extern/strlcpy.h"
#include "extern/concat.h"
struct arg {
@@ -56,6 +57,10 @@ static char *ram_perc(void);
static char *ram_used(void);
static char *ram_total(void);
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);
@@ -63,13 +68,13 @@ static char *username(void);
static char *vol_perc(const char *card);
static char *wifi_perc(const char *iface);
static char *wifi_essid(const char *iface);
-static void set_status(const char *str);
+static char *kernel_release(void);
static void sighandler(const int signo);
static void usage(void);
char *argv0;
char concat[];
-static unsigned short int delay;
+static unsigned short int delay = 0;
static unsigned short int done;
static unsigned short int dflag, oflag;
static Display *dpy;
@@ -109,7 +114,7 @@ battery_perc(const char *bat)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "%i", &perc);
fclose(fp);
@@ -127,7 +132,7 @@ battery_state(const char *bat)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "%12s", state);
fclose(fp);
@@ -153,18 +158,18 @@ cpu_perc(void)
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
- return smprintf(UNKNOWN_STR);
+ 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");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
fclose(fp);
@@ -181,7 +186,7 @@ datetime(const char *fmt)
t = time(NULL);
if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%s", str);
@@ -194,7 +199,7 @@ disk_free(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
@@ -208,7 +213,7 @@ disk_perc(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
@@ -223,7 +228,7 @@ disk_total(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
@@ -236,7 +241,7 @@ disk_used(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
@@ -251,7 +256,7 @@ 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 smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "%d", &num);
fclose(fp);
@@ -269,16 +274,11 @@ static char *
hostname(void)
{
char buf[HOST_NAME_MAX];
- FILE *fp;
- fp = fopen("/proc/sys/kernel/hostname", "r");
- if (fp == NULL) {
- warn("Failed to open file /proc/sys/kernel/hostname");
- return smprintf(UNKNOWN_STR);
+ if (gethostname(buf, sizeof(buf)) == -1) {
+ warn("hostname");
+ return smprintf("%s", UNKNOWN_STR);
}
- fgets(buf, sizeof(buf), fp);
- buf[strlen(buf)-1] = '\0';
- fclose(fp);
return smprintf("%s", buf);
}
@@ -292,7 +292,7 @@ ip(const char *iface)
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IP address for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
@@ -303,7 +303,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 smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%s", host);
}
@@ -311,7 +311,7 @@ ip(const char *iface)
freeifaddrs(ifaddr);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
static char *
@@ -321,7 +321,7 @@ load_avg(void)
if (getloadavg(avgs, 3) < 0) {
warnx("Failed to get the load avg");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
@@ -336,7 +336,7 @@ ram_free(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "MemFree: %ld kB\n", &free);
fclose(fp);
@@ -353,7 +353,7 @@ ram_perc(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
@@ -373,7 +373,7 @@ ram_total(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fclose(fp);
@@ -390,7 +390,7 @@ ram_used(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
@@ -404,21 +404,177 @@ ram_used(void)
static char *
run_command(const char *cmd)
{
+ char *nlptr;
FILE *fp;
- char buf[64] = "n/a";
+ char buf[1024] = UNKNOWN_STR;
fp = popen(cmd, "r");
if (fp == NULL) {
warn("Failed to get command output for %s", cmd);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fgets(buf, sizeof(buf), fp);
- buf[sizeof(buf)-1] = '\0';
pclose(fp);
+ buf[strlen(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);
+
+ 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 *
+swap_perc(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_perc: 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);
+
+ 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 *
+swap_total(void)
+{
+ long total;
+ 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_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);
+ }
+
+ 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("%f", (float)(total - free - cached) / 1024 / 1024);
+}
+
static char *
temp(const char *file)
{
@@ -428,7 +584,7 @@ temp(const char *file)
fp = fopen(file, "r");
if (fp == NULL) {
warn("Failed to open file %s", file);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fscanf(fp, "%d", &temp);
fclose(fp);
@@ -458,7 +614,7 @@ username(void)
if (pw == NULL) {
warn("Failed to get username");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
return smprintf("%s", pw->pw_name);
@@ -474,6 +630,7 @@ uid(void)
static char *
vol_perc(const char *card)
{
+ int mute;
long int vol, max, min;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
@@ -491,17 +648,23 @@ vol_perc(const char *card)
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
warn("Failed to get volume percentage for %s", card);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", 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);
+ snd_mixer_selem_get_playback_switch(elem, 0, &mute);
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
- return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
+ if (!mute)
+ return smprintf("mute");
+ else if (max == 0)
+ return smprintf("0%%");
+ else
+ return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));
}
static char *
@@ -517,18 +680,18 @@ wifi_perc(const char *iface)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fgets(status, 5, fp);
fclose(fp);
if(strcmp(status, "up\n") != 0) {
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
fp = fopen("/proc/net/wireless", "r");
if (fp == NULL) {
warn("Failed to open file /proc/net/wireless");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
ccat(2, iface, ":");
fgets(buf, sizeof(buf), fp);
@@ -536,11 +699,11 @@ wifi_perc(const char *iface)
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", &perc);
+ if ((datastart = strstr(buf, concat)) == 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);
return smprintf("%d%%", perc);
}
@@ -554,30 +717,34 @@ wifi_essid(const char *iface)
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
- sprintf(wreq.ifr_name, iface);
+ snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+
if (sockfd == -1) {
warn("Failed to get ESSID for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
}
wreq.u.essid.pointer = id;
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
warn("Failed to get ESSID for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ 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);
}
-static void
-set_status(const char *str)
+static char *
+kernel_release(void)
{
- XStoreName(dpy, DefaultRootWindow(dpy), str);
- XSync(dpy, False);
+ struct utsname udata;
+ if (uname(&udata) < 0)
+ return smprintf("%s", UNKNOWN_STR);
+
+ return smprintf("%s", udata.release);
}
static void
@@ -599,7 +766,7 @@ int
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;
@@ -621,8 +788,8 @@ main(int argc, char *argv[])
if (dflag && oflag) {
usage();
}
- if (dflag) {
- (void)daemon(1, 1);
+ if (dflag && daemon(1, 1) < 0) {
+ err(1, "daemon");
}
memset(&act, 0, sizeof(act));
@@ -634,6 +801,8 @@ main(int argc, char *argv[])
dpy = XOpenDisplay(NULL);
}
+ setlocale(LC_ALL, "");
+
while (!done) {
status_string[0] = '\0';
@@ -646,30 +815,33 @@ main(int argc, char *argv[])
}
element = smprintf(argument.fmt, res);
if (element == NULL) {
- element = smprintf(UNKNOWN_STR);
+ element = smprintf("%s", UNKNOWN_STR);
warnx("Failed to format output");
}
- strlcat(status_string, element, sizeof(status_string));
+ if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string))
+ warnx("Output too long");
free(res);
free(element);
}
if (!oflag) {
- set_status(status_string);
+ XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+ XSync(dpy, False);
} else {
printf("%s\n", status_string);
}
- /*
- * subtract delay time spend in function
- * calls from the actual global delay time
- */
- sleep(UPDATE_INTERVAL - delay);
- delay = 0;
+ if ((UPDATE_INTERVAL - delay) <= 0) {
+ delay = 0;
+ continue;
+ } else {
+ sleep(UPDATE_INTERVAL - delay);
+ delay = 0;
+ }
}
if (!oflag) {
- set_status(NULL);
+ XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XCloseDisplay(dpy);
}