Add FreeBSD support for netspeeds, entropy and ip components

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 0c4605f..96fa5b6 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -36,7 +36,7 @@ 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 +
-                      (a->tv_nsec < b->tv_nsec) * 1000000000;
+                      (a->tv_nsec < b->tv_nsec) * 1E9;
 }
 
 static void
@@ -73,10 +73,6 @@ main(int argc, char *argv[])
        sigaction(SIGINT,  &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       if (sflag) {
-               setbuf(stdout, NULL);
-       }
-
        if (!sflag && !(dpy = XOpenDisplay(NULL))) {
                die("XOpenDisplay: Failed to open display");
        }
@@ -91,21 +87,21 @@ main(int argc, char *argv[])
                        if (!(res = args[i].func(args[i].args))) {
                                res = unknown_str;
                        }
-                       if ((ret = snprintf(status + len, sizeof(status) - len,
+                       if ((ret = esnprintf(status + len, sizeof(status) - len,
                                            args[i].fmt, res)) < 0) {
-                               warn("snprintf:");
-                               break;
-                       } else if ((size_t)ret >= sizeof(status) - len) {
-                               warn("snprintf: Output truncated");
                                break;
                        }
                        len += ret;
                }
 
                if (sflag) {
-                       printf("%s\n", status);
+                       puts(status);
+                       fflush(stdout);
+                       if (ferror(stdout))
+                               die("puts:");
                } else {
-                       if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0) {
+                       if (XStoreName(dpy, DefaultRootWindow(dpy), status)
+                            < 0) {
                                die("XStoreName: Allocation failed");
                        }
                        XFlush(dpy);
@@ -118,7 +114,7 @@ main(int argc, char *argv[])
                        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) {