battery: OS split

diff --git a/Makefile b/Makefile
index 871f09d263e4a8886001937d65372bec4b63b23f..85eeabae4d1e47ada2bb09c66b265a54dd5f2ec1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include config.mk
 
 REQ = util
 COM =\
-       components/battery\
+       components/$(OS)/battery \
        components/cpu\
        components/datetime\
        components/disk\

diff --git a/components/Linux/battery.c b/components/Linux/battery.c
new file mode 100644 (file)
index 0000000..654ddab
--- /dev/null
+++ b/components/Linux/battery.c
@@ -0,0 +1,58 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+#include <string.h>
+
+#include "../../util.h"
+
+const char *
+battery_perc(const char *bat)
+{
+       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;
+}
+
+const char *
+battery_power(const char *bat)
+{
+       int watts;
+       char path[PATH_MAX];
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
+       return (pscanf(path, "%i", &watts) == 1) ?
+              bprintf("%d", (watts + 500000) / 1000000) : NULL;
+}
+
+const char *
+battery_state(const char *bat)
+{
+       struct {
+               char *state;
+               char *symbol;
+       } map[] = {
+               { "Charging",    "+" },
+               { "Discharging", "-" },
+               { "Full",        "=" },
+               { "Unknown",     "/" },
+       };
+       size_t i;
+       char path[PATH_MAX], state[12];
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
+       if (pscanf(path, "%12s", state) != 1) {
+               return NULL;
+       }
+
+       for (i = 0; i < LEN(map); i++) {
+               if (!strcmp(map[i].state, state)) {
+                       break;
+               }
+       }
+       return (i == LEN(map)) ? "?" : map[i].symbol;
+}

diff --git a/components/OpenBSD/battery.c b/components/OpenBSD/battery.c
new file mode 100644 (file)
index 0000000..daefd77
--- /dev/null
+++ b/components/OpenBSD/battery.c
@@ -0,0 +1,32 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <machine/apmvar.h>
+
+#include "../../util.h"
+
+const char *
+battery_perc(const char *null)
+{
+       struct apm_power_info apm_info;
+       int fd;
+
+       fd = open("/dev/apm", O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+               return NULL;
+       }
+
+       if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+               fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
+               close(fd);
+               return NULL;
+       }
+       close(fd);
+
+       return bprintf("%d", apm_info.battery_life);
+}

diff --git a/components/battery.c b/components/battery.c
deleted file mode 100644 (file)
index 955d8ab..0000000
--- a/components/battery.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__linux__)
-#include <limits.h>
-#include <string.h>
-#elif defined(__OpenBSD__)
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-#endif
-
-#include "../util.h"
-
-#if defined(__linux__)
-const char *
-battery_perc(const char *bat)
-{
-       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 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) {
-               fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
-               return NULL;
-       }
-
-       if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-               fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
-               close(fd);
-               return NULL;
-       }
-       close(fd);
-
-       return bprintf("%d", apm_info.battery_life);
-}
-#endif
-
-#if defined(__linux__)
-const char *
-battery_power(const char *bat)
-{
-       int watts;
-       char path[PATH_MAX];
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
-       return (pscanf(path, "%i", &watts) == 1) ?
-              bprintf("%d", (watts + 500000) / 1000000) : NULL;
-}
-
-const char *
-battery_state(const char *bat)
-{
-       struct {
-               char *state;
-               char *symbol;
-       } map[] = {
-               { "Charging",    "+" },
-               { "Discharging", "-" },
-               { "Full",        "=" },
-               { "Unknown",     "/" },
-       };
-       size_t i;
-       char path[PATH_MAX], state[12];
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
-       if (pscanf(path, "%12s", state) != 1) {
-               return NULL;
-       }
-
-       for (i = 0; i < LEN(map); i++) {
-               if (!strcmp(map[i].state, state)) {
-                       break;
-               }
-       }
-       return (i == LEN(map)) ? "?" : map[i].symbol;
-}
-#endif