Port battery_remaining to Linux

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index b4eb761..0c4605f 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,7 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <err.h>

 #include <errno.h>
 #include <errno.h>

-#include <locale.h>

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


@@ -10,6 +8,7 @@
 #include <X11/Xlib.h>
 
 #include "arg.h"
 #include <X11/Xlib.h>
 
 #include "arg.h"

+#include "slstatus.h"

 #include "util.h"
 
 struct arg {
 #include "util.h"
 
 struct arg {


@@ -18,16 +17,17 @@ struct arg {
        const char *args;
 };
 
        const char *args;
 };
 

-char *argv0;
-static unsigned short int done;
+char buf[1024];
+static int done;

 static Display *dpy;
 
 static Display *dpy;
 

-#include "slstatus.h"

 #include "config.h"
 
 static void
 terminate(const int signo)
 {
 #include "config.h"
 
 static void
 terminate(const int signo)
 {

+       (void)signo;
+

        done = 1;
 }
 
        done = 1;
 }
 


@@ -42,8 +42,7 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

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

 }
 
 int
 }
 
 int


@@ -52,9 +51,11 @@ 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 = 0;
+       int sflag, ret;

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

+       const char *res;

 
 

+       sflag = 0;

        ARGBEGIN {
                case 's':
                        sflag = 1;
        ARGBEGIN {
                case 's':
                        sflag = 1;


@@ -67,40 +68,53 @@ 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);
 

+       if (sflag) {
+               setbuf(stdout, NULL);
+       }
+

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

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

        }
 
        while (!done) {
        }
 
        while (!done) {

-               clock_gettime(CLOCK_MONOTONIC, &start);
+               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++) {

-                       len += snprintf(status + len, sizeof(status) - len,
-                                       args[i].fmt, args[i].func(args[i].args));
-
-                       if (len >= sizeof(status)) {
-                               status[sizeof(status) - 1] = '\0';
+                       if (!(res = args[i].func(args[i].args))) {
+                               res = unknown_str;
+                       }
+                       if ((ret = snprintf(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);
                } else {
                }
 
                if (sflag) {
                        printf("%s\n", status);
                } 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;


@@ -108,14 +122,19 @@ main(int argc, char *argv[])
                        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:");
+                               }

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