X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7e3f80c1a39e16973f3c9235d3f9d85df0d1b995..ea2e2bd00403e02bee6298cfbb78eaa45869c851:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index 4314e81..a63b9d0 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,86 +1,112 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
+#include <errno.h>
 #include <stdio.h>
-#ifdef __linux__
-#include <limits.h>
 #include <string.h>
-#elif __OpenBSD__
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-#endif
 
 #include "../util.h"
 
-const char *
-battery_perc(const char *bat)
-{
-#ifdef __linux__
-	int perc;
-	char path[PATH_MAX];
+#if defined(__linux__)
+	#include <limits.h>
 
-	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__
-	struct apm_power_info apm_info;
-	int fd;
+	const char *
+	battery_perc(const char *bat)
+	{
+		int perc;
+		char path[PATH_MAX];
 
-	fd = open("/dev/apm", O_RDONLY);
-	if (fd < 0) {
-		warn("Failed to open file /dev/apm");
-		return NULL;
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/capacity");
+		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
 	}
 
-	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-		warn("Failed to get battery info");
-		close(fd);
-		return NULL;
-	}
-	close(fd);
+	const char *
+	battery_state(const char *bat)
+	{
+		struct {
+			char *state;
+			char *symbol;
+		} map[] = {
+			{ "Charging",    "+" },
+			{ "Discharging", "-" },
+		};
+		size_t i;
+		char path[PATH_MAX], state[12];
 
-	return bprintf("%d", apm_info.battery_life);
-#endif
-}
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/status");
+		if (pscanf(path, "%12s", state) != 1) {
+			return NULL;
+		}
 
-#ifdef __linux__
-const char *
-battery_power(const char *bat)
-{
-	int watts;
-	char path[PATH_MAX];
+		for (i = 0; i < LEN(map); i++) {
+			if (!strcmp(map[i].state, state)) {
+				break;
+			}
+		}
+		return (i == LEN(map)) ? "?" : map[i].symbol;
+	}
+#elif defined(__OpenBSD__)
+	#include <fcntl.h>
+	#include <machine/apmvar.h>
+	#include <sys/ioctl.h>
+	#include <unistd.h>
 
-	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_perc(const char *null)
+	{
+		struct apm_power_info apm_info;
+		int fd;
 
-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];
+		fd = open("/dev/apm", O_RDONLY);
+		if (fd < 0) {
+			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+			return NULL;
+		}
 
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
-	if (pscanf(path, "%12s", state) != 1) {
-		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);
 	}
 
-	for (i = 0; i < LEN(map); i++) {
-		if (!strcmp(map[i].state, state)) {
-			break;
+	const char *
+	battery_state(const char *bat)
+	{
+		int fd;
+		size_t i;
+		struct apm_power_info apm_info;
+		struct {
+			unsigned int state;
+			char *symbol;
+		} map[] = {
+			{ APM_AC_ON,      "+" },
+			{ APM_AC_OFF,     "-" },
+		};
+
+		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);
+
+		for (i = 0; i < LEN(map); i++) {
+			if (map[i].state == apm_info.ac_state) {
+				break;
+			}
 		}
+		return (i == LEN(map)) ? "?" : map[i].symbol;
 	}
-	return (i == LEN(map)) ? "?" : map[i].symbol;
-}
 #endif