Add comment for FreeBSD to config.mk

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index c1cf8ac..64da5cb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <locale.h>
+#include <errno.h>

 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -17,9 +17,8 @@ struct arg {
        const char *args;
 };
 
        const char *args;
 };
 

-char *argv0;

 char buf[1024];
 char buf[1024];

-static unsigned short int done;
+static volatile sig_atomic_t done;

 static Display *dpy;
 
 #include "config.h"
 static Display *dpy;
 
 #include "config.h"


@@ -27,9 +26,8 @@ static Display *dpy;
 static void
 terminate(const int signo)
 {
 static void
 terminate(const int signo)
 {

-       (void)signo;
-
-       done = 1;
+       if (signo != SIGUSR1)
+               done = 1;

 }
 
 static void
 }
 
 static void


@@ -37,14 +35,13 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
 {
        res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
        res->tv_nsec = a->tv_nsec - b->tv_nsec +
 {
        res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
        res->tv_nsec = a->tv_nsec - b->tv_nsec +

-                      (a->tv_nsec < b->tv_nsec) * 1000000000;
+                      (a->tv_nsec < b->tv_nsec) * 1E9;

 }
 
 static void
 usage(void)
 {
 }
 
 static void
 usage(void)
 {

-       fprintf(stderr, "usage: %s [-s]\n", argv0);
-       exit(1);
+       die("usage: %s [-s] [-1]", argv0);

 }
 
 int
 }
 
 int


@@ -53,11 +50,15 @@ main(int argc, char *argv[])
        struct sigaction act;
        struct timespec start, current, diff, intspec, wait;
        size_t i, len;
        struct sigaction act;
        struct timespec start, current, diff, intspec, wait;
        size_t i, len;

-       int sflag;
+       int sflag, ret;

        char status[MAXLEN];
        char status[MAXLEN];

+       const char *res;

 
        sflag = 0;
        ARGBEGIN {
 
        sflag = 0;
        ARGBEGIN {

+               case '1':
+                       done = 1;
+                       /* fallthrough */

                case 's':
                        sflag = 1;
                        break;
                case 's':
                        sflag = 1;
                        break;


@@ -69,57 +70,71 @@ main(int argc, char *argv[])
                usage();
        }
 
                usage();
        }
 

-       setlocale(LC_ALL, "");
-

        memset(&act, 0, sizeof(act));
        act.sa_handler = terminate;
        sigaction(SIGINT,  &act, NULL);
        sigaction(SIGTERM, &act, NULL);
        memset(&act, 0, sizeof(act));
        act.sa_handler = terminate;
        sigaction(SIGINT,  &act, NULL);
        sigaction(SIGTERM, &act, NULL);

+       act.sa_flags |= SA_RESTART;
+       sigaction(SIGUSR1, &act, NULL);

 
        if (!sflag && !(dpy = XOpenDisplay(NULL))) {
 
        if (!sflag && !(dpy = XOpenDisplay(NULL))) {

-               fprintf(stderr, "Cannot open display");
-               return 1;
+               die("XOpenDisplay: Failed to open display");

        }
 
        }
 

-       while (!done) {
-               clock_gettime(CLOCK_MONOTONIC, &start);
+       do {
+               if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
+                       die("clock_gettime:");
+               }

 
                status[0] = '\0';
                for (i = len = 0; i < LEN(args); i++) {
 
                status[0] = '\0';
                for (i = len = 0; i < LEN(args); i++) {

-                       const char * res = args[i].func(args[i].args);
-                       res = (res == NULL) ? unknown_str : res;
-                       len += snprintf(status + len, sizeof(status) - len,
-                                       args[i].fmt, res);
-
-                       if (len >= sizeof(status)) {
-                               status[sizeof(status) - 1] = '\0';
+                       if (!(res = args[i].func(args[i].args))) {
+                               res = unknown_str;
+                       }
+                       if ((ret = esnprintf(status + len, sizeof(status) - len,
+                                           args[i].fmt, res)) < 0) {
+                               break;

                        }
                        }

+                       len += ret;

                }
 
                if (sflag) {
                }
 
                if (sflag) {

-                       printf("%s\n", status);
+                       puts(status);
+                       fflush(stdout);
+                       if (ferror(stdout))
+                               die("puts:");

                } else {
                } else {

-                       XStoreName(dpy, DefaultRootWindow(dpy), status);
-                       XSync(dpy, False);
+                       if (XStoreName(dpy, DefaultRootWindow(dpy), status)
+                            < 0) {
+                               die("XStoreName: Allocation failed");
+                       }
+                       XFlush(dpy);

                }
 
                if (!done) {
                }
 
                if (!done) {

-                       clock_gettime(CLOCK_MONOTONIC, &current);
+                       if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
+                               die("clock_gettime:");
+                       }

                        difftimespec(&diff, &current, &start);
 
                        intspec.tv_sec = interval / 1000;
                        difftimespec(&diff, &current, &start);
 
                        intspec.tv_sec = interval / 1000;

-                       intspec.tv_nsec = (interval % 1000) * 1000000;
+                       intspec.tv_nsec = (interval % 1000) * 1E6;

                        difftimespec(&wait, &intspec, &diff);
 
                        if (wait.tv_sec >= 0) {
                        difftimespec(&wait, &intspec, &diff);
 
                        if (wait.tv_sec >= 0) {

-                               nanosleep(&wait, NULL);
+                               if (nanosleep(&wait, NULL) < 0 &&
+                                   errno != EINTR) {
+                                       die("nanosleep:");
+                               }

                        }
                }
                        }
                }

-       }
+       } while (!done);

 
        if (!sflag) {
                XStoreName(dpy, DefaultRootWindow(dpy), NULL);
 
        if (!sflag) {
                XStoreName(dpy, DefaultRootWindow(dpy), NULL);

-               XCloseDisplay(dpy);
+               if (XCloseDisplay(dpy) < 0) {
+                       die("XCloseDisplay: Failed to close display");
+               }

        }
 
        return 0;
        }
 
        return 0;