X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/74891945d897530b30c2c29844808d63bff625b7..ec5c35ec9f23254f09e734d0c1880559774dfa52:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index 90e8590..ff06f40 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -7,6 +7,26 @@
 
 #if defined(__linux__)
 	#include <limits.h>
+	#include <unistd.h>
+
+	#define CHARGE_NOW    "/sys/class/power_supply/%s/charge_now"
+	#define ENERGY_NOW    "/sys/class/power_supply/%s/energy_now"
+	#define CURRENT_NOW   "/sys/class/power_supply/%s/current_now"
+	#define POWER_NOW     "/sys/class/power_supply/%s/power_now"
+
+	static const char *
+	pick(const char *bat, const char *f1, const char *f2, char *path, size_t length)
+	{
+		if (esnprintf(path, length, f1, bat) > 0 && access(path, R_OK) == 0) {
+			return f1;
+		}
+
+		if (esnprintf(path, length, f2, bat) > 0 && access(path, R_OK) == 0) {
+			return f2;
+		}
+
+		return NULL;
+	}
 
 	const char *
 	battery_perc(const char *bat)
@@ -14,9 +34,16 @@
 		int perc;
 		char path[PATH_MAX];
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/capacity");
-		return (pscanf(path, "%d", &perc) == 1) ? bprintf("%d", perc) : NULL;
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/capacity",
+		              bat) < 0) {
+			return NULL;
+		}
+		if (pscanf(path, "%d", &perc) != 1) {
+			return NULL;
+		}
+
+		return bprintf("%d", perc);
 	}
 
 	const char *
@@ -32,8 +59,11 @@
 		size_t i;
 		char path[PATH_MAX], state[12];
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/status");
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/status",
+		              bat) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%12s", state) != 1) {
 			return NULL;
 		}
@@ -53,21 +83,23 @@
 		float timeleft;
 		char path[PATH_MAX], state[12];
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/status");
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/status",
+		              bat) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%12s", state) != 1) {
 			return NULL;
 		}
 
+		if (pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof (path)) == NULL ||
+		    pscanf(path, "%d", &charge_now) < 0) {
+			return NULL;
+		}
+
 		if (!strcmp(state, "Discharging")) {
-			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-					 bat, "/charge_now");
-			if (pscanf(path, "%d", &charge_now) != 1) {
-				return NULL;
-			}
-			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-					 bat, "/current_now");
-			if (pscanf(path, "%d", &current_now) != 1) {
+			if (pick(bat, CURRENT_NOW, POWER_NOW, path, sizeof (path)) == NULL ||
+			    pscanf(path, "%d", &current_now) < 0) {
 				return NULL;
 			}