all repos — slstatus @ 13604963bc589ab9281da03b1f76b8db7e21daa7

my build of slstatus (tools.suckless.org/slstatus/)

Merge branch 'master' into master
parazyd parazyd@users.noreply.github.com
Fri, 30 Dec 2016 14:21:19 +0100
commit

13604963bc589ab9281da03b1f76b8db7e21daa7

parent

62f40164309cd6f22be9fae89c071221944618e4

8 files changed, 155 insertions(+), 184 deletions(-)

jump to
M CONTRIBUTORS.mdCONTRIBUTORS.md

@@ -6,6 +6,6 @@

- [Vlaix](https://github.com/Vlaix) - [pfannkuckengesicht](https://github.com/pfannkuchengesicht) - [sahne](https://github.com/sahne) -- [Ali H. Fardan](http://raiz.duckdns.org) +- [Ali H. Fardan](http://hexeract.info) - [Quentin Rameau](https://fifth.space) - [Mike Coddington](https://coddington.us)
M MakefileMakefile

@@ -31,16 +31,16 @@ @${CC} -o $@ ${OBJ} ${LDFLAGS}

clean: @echo cleaning - @rm -f ${NAME} ${OBJ} ${NAME}-${VERSION}.tar.gz + @rm -f ${NAME} ${OBJ} ${NAME}.tar.gz dist: clean @echo creating dist tarball - @mkdir -p ${NAME}-${VERSION} + @mkdir -p ${NAME} @cp -R Makefile config.mk LICENSE \ - ${SRC} ${NAME}-${VERSION} - @tar -cf ${NAME}-${VERSION}.tar ${NAME}-${VERSION} - @gzip ${NAME}-${VERSION}.tar - @rm -rf ${NAME}-${VERSION} + ${SRC} ${NAME} + @tar -cf ${NAME}.tar ${NAME} + @gzip ${NAME}.tar + @rm -rf ${NAME} install: all @echo installing executable file to ${DESTDIR}${PREFIX}/bin

@@ -49,7 +49,7 @@ @cp -f ${NAME} ${DESTDIR}${PREFIX}/bin

@chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME} @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 @mkdir -p ${DESTDIR}${MANPREFIX}/man1 - @sed "s/VERSION/${VERSION}/g" < ${NAME}.1 > ${DESTDIR}${MANPREFIX}/man1/${NAME}.1 + @cp -f ${NAME}.1 ${DESTDIR}${MANPREFIX}/man1 @chmod 644 ${DESTDIR}${MANPREFIX}/man1/${NAME}.1 uninstall:
A TODO.md

@@ -0,0 +1,6 @@

+* [ ] fix build on OpenBSD +* [ ] fix build on NetBSD +* [ ] fix build on FreeBSD +* [X] test wifi functions after the last few commits +* [ ] allow calling routines from command line arguments like: slstatus --datetime "%F %T" +* [X] see if drkhsh approves it
M config.mkconfig.mk

@@ -1,7 +1,5 @@

# See LICENSE file for copyright and license details. -VERSION = 3.0 - PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man
M extern/concat.hextern/concat.h

@@ -11,6 +11,9 @@ va_list ap;

unsigned short int i; concat[0] = '\0'; + if (count == 0) + return; + va_start(ap, count); for(i = 0; i < count; i++) strlcat(concat, va_arg(ap, char *), sizeof(concat));
D extern/strlcpy.h

@@ -1,50 +0,0 @@

-/* $OpenBSD: strlcpy.c,v 1.13 2015/08/31 02:53:57 guenther Exp $ */ - -/* - * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <string.h> - -/* - * Copy string src to buffer dst of size dsize. At most dsize-1 - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ -size_t -strlcpy(char *dst, const char *src, size_t dsize) -{ - const char *osrc = src; - size_t nleft = dsize; - - /* Copy as many bytes as will fit. */ - if (nleft != 0) { - while (--nleft != 0) { - if ((*dst++ = *src++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src. */ - if (nleft == 0) { - if (dsize != 0) - *dst = '\0'; /* NUL-terminate dst */ - while (*src++) - ; - } - - return(src - osrc - 1); /* count does not include NUL */ -}
M slstatus.1slstatus.1

@@ -1,4 +1,4 @@

-.TH SLSTATUS 1 slstatus\-VERSION +.TH SLSTATUS 1 slstatus .SH NAME slstatus \- suckless status .SH SYNOPSIS
M slstatus.cslstatus.c

@@ -26,11 +26,9 @@ #include <unistd.h>

#include <X11/Xlib.h> #undef strlcat -#undef strlcpy #include "extern/arg.h" #include "extern/strlcat.h" -#include "extern/strlcpy.h" #include "extern/concat.h" struct arg {

@@ -52,6 +50,7 @@ static char *entropy(void);

static char *gid(void); static char *hostname(void); static char *ip(const char *iface); +static char *kernel_release(void); static char *load_avg(void); static char *ram_free(void); static char *ram_perc(void);

@@ -69,14 +68,12 @@ 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 char *kernel_release(void); -static void set_status(const char *str); static void sighandler(const int signo); -static void usage(void); +static void usage(int); 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;

@@ -116,7 +113,7 @@ ccat(3, "/sys/class/power_supply/", bat, "/capacity");

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);

@@ -134,7 +131,7 @@ ccat(3, "/sys/class/power_supply/", bat, "/status");

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);

@@ -160,18 +157,18 @@

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);

@@ -188,7 +185,7 @@ char str[80];

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);

@@ -201,7 +198,7 @@ struct statvfs fs;

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);

@@ -215,7 +212,7 @@ struct statvfs fs;

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));

@@ -230,7 +227,7 @@ struct statvfs fs;

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);

@@ -243,7 +240,7 @@ struct statvfs fs;

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);

@@ -258,7 +255,7 @@

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);

@@ -279,7 +276,7 @@ char buf[HOST_NAME_MAX];

if (gethostname(buf, sizeof(buf)) == -1) { warn("hostname"); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%s", buf);

@@ -294,7 +291,7 @@ char host[NI_MAXHOST];

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) {

@@ -305,7 +302,7 @@ 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); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%s", host); }

@@ -313,7 +310,19 @@ }

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 *

@@ -323,7 +332,7 @@ double avgs[3];

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]);

@@ -338,7 +347,7 @@

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);

@@ -355,7 +364,7 @@

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);

@@ -375,7 +384,7 @@

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);

@@ -392,7 +401,7 @@

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);

@@ -406,19 +415,22 @@

static char * run_command(const char *cmd) { + char *nlptr; FILE *fp; - char buf[1024] = "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)-1, fp); + fgets(buf, sizeof(buf), fp); pclose(fp); + buf[strlen(buf)] = '\0'; - buf[strlen(buf)] = '\0'; - strtok(buf, "\n"); + if ((nlptr = strstr(buf, "\n")) != NULL) { + nlptr[0] = '\0'; + } return smprintf("%s", buf); }

@@ -435,23 +447,26 @@

fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return smprintf(UNKNOWN_STR); + 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); } - bytes_read = fread(buf, sizeof(char), sizeof(buf), fp); + buf[bytes_read] = '\0'; fclose(fp); - if (bytes_read == 0 || bytes_read == sizeof(buf)) { - warn("Failed to read /proc/meminfo\n"); - return smprintf(UNKNOWN_STR); - } - match = strstr(buf, "SwapTotal"); - sscanf(match, "SwapTotal: %ld kB\n", &total); - if (total == 0) { - return smprintf(UNKNOWN_STR); + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); } + sscanf(match, "SwapTotal: %ld kB\n", &total); - match = strstr(buf, "SwapFree"); + 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);

@@ -469,26 +484,31 @@

fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return smprintf(UNKNOWN_STR); + 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); } - bytes_read = fread(buf, sizeof(char), sizeof(buf), fp); + buf[bytes_read] = '\0'; fclose(fp); - if (bytes_read == 0 || bytes_read == sizeof(buf)) { - warn("Failed to read /proc/meminfo\n"); - return smprintf(UNKNOWN_STR); - } - match = strstr(buf, "SwapTotal"); + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } sscanf(match, "SwapTotal: %ld kB\n", &total); - if (total == 0) { - return smprintf(UNKNOWN_STR); - } - match = strstr(buf, "SwapCached"); + if ((match = strstr(buf, "SwapCached")) == NULL) { + return smprintf("%s", UNKNOWN_STR); + } sscanf(match, "SwapCached: %ld kB\n", &cached); - match = strstr(buf, "SwapFree"); + 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);

@@ -506,21 +526,21 @@

fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); } - bytes_read = fread(buf, sizeof(char), sizeof(buf), fp); + 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 (bytes_read == 0 || bytes_read == sizeof(buf)) { - warn("Failed to read /proc/meminfo\n"); - return smprintf(UNKNOWN_STR); + + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); } - - match = strstr(buf, "SwapTotal"); sscanf(match, "SwapTotal: %ld kB\n", &total); - if (total == 0) { - return smprintf(UNKNOWN_STR); - } return smprintf("%f", (float)total / 1024 / 1024); }

@@ -537,26 +557,30 @@

fp = fopen("/proc/meminfo", "r"); if (fp == NULL) { warn("Failed to open file /proc/meminfo"); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); } - bytes_read = fread(buf, sizeof(char), sizeof(buf), fp); + 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 (bytes_read == 0 || bytes_read == sizeof(buf)) { - warn("Failed to read /proc/meminfo\n"); - return smprintf(UNKNOWN_STR); + + if ((match = strstr(buf, "SwapTotal")) == NULL) { + return smprintf("%s", UNKNOWN_STR); } + sscanf(match, "SwapTotal: %ld kB\n", &total); - match = strstr(buf, "SwapTotal"); - sscanf(match, "SwapTotal: %ld kB\n", &total); - if (total == 0) { - return smprintf(UNKNOWN_STR); + if ((match = strstr(buf, "SwapCached")) == NULL) { + return smprintf("%s", UNKNOWN_STR); } - - match = strstr(buf, "SwapCached"); sscanf(match, "SwapCached: %ld kB\n", &cached); - match = strstr(buf, "SwapFree"); + 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);

@@ -571,7 +595,7 @@

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);

@@ -601,7 +625,7 @@ struct passwd *pw = getpwuid(uid);

if (pw == NULL) { warn("Failed to get username"); - return smprintf(UNKNOWN_STR); + return smprintf("%s", UNKNOWN_STR); } return smprintf("%s", pw->pw_name);

@@ -656,18 +680,18 @@ ccat(3, "/sys/class/net/", iface, "/operstate");

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);

@@ -675,11 +699,11 @@ 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", &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); }

@@ -693,42 +717,26 @@ struct iwreq wreq;

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 char * -kernel_release(void) -{ - struct utsname udata; - if (uname(&udata) < 0) - return smprintf(UNKNOWN_STR); - - return smprintf("%s", udata.release); -} - -static void -set_status(const char *str) -{ - XStoreName(dpy, DefaultRootWindow(dpy), str); - XSync(dpy, False); -} - static void sighandler(const int signo) {

@@ -738,17 +746,17 @@ }

} static void -usage(void) +usage(int eval) { - fprintf(stderr, "usage: %s [-dhov]\n", argv0); - exit(1); + fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0); + exit(eval); } 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;

@@ -761,14 +769,16 @@ case 'o':

oflag = 1; break; case 'v': - printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION); + printf("slstatus (C) 2016 slstatus engineers\n"); return 0; + case 'h': + usage(0); default: - usage(); + usage(1); } ARGEND if (dflag && oflag) { - usage(); + usage(1); } if (dflag && daemon(1, 1) < 0) { err(1, "daemon");

@@ -797,30 +807,34 @@ res = argument.func(argument.args);

} 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); }