Makefile: detect running OS

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 4314e81..955d8ab 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,10 +1,11 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

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

 #include <stdio.h>
 #include <stdio.h>

-#ifdef __linux__
+#include <string.h>
+#if defined(__linux__)

 #include <limits.h>
 #include <string.h>
 #include <limits.h>
 #include <string.h>

-#elif __OpenBSD__
+#elif defined(__OpenBSD__)

 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>


@@ -13,38 +14,42 @@
 
 #include "../util.h"
 
 
 #include "../util.h"
 

+#if defined(__linux__)

 const char *
 battery_perc(const char *bat)
 {
 const char *
 battery_perc(const char *bat)
 {

-#ifdef __linux__

        int perc;
        char path[PATH_MAX];
 
        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
        return (pscanf(path, "%i", &perc) == 1) ?
               bprintf("%d", perc) : NULL;
        int perc;
        char path[PATH_MAX];
 
        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
        return (pscanf(path, "%i", &perc) == 1) ?
               bprintf("%d", perc) : NULL;

-#elif __OpenBSD__
+}
+#elif defined(__OpenBSD__)
+const char *
+battery_perc(const char *null)
+{

        struct apm_power_info apm_info;
        int fd;
 
        fd = open("/dev/apm", O_RDONLY);
        if (fd < 0) {
        struct apm_power_info apm_info;
        int fd;
 
        fd = open("/dev/apm", O_RDONLY);
        if (fd < 0) {

-               warn("Failed to open file /dev/apm");
+               fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));

                return NULL;
        }
 
        if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
                return NULL;
        }
 
        if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {

-               warn("Failed to get battery info");
+               fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));

                close(fd);
                return NULL;
        }
        close(fd);
 
        return bprintf("%d", apm_info.battery_life);
                close(fd);
                return NULL;
        }
        close(fd);
 
        return bprintf("%d", apm_info.battery_life);

-#endif

 }
 }

+#endif

 
 

-#ifdef __linux__
+#if defined(__linux__)

 const char *
 battery_power(const char *bat)
 {
 const char *
 battery_power(const char *bat)
 {