X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/aac29e2bba1d34762971718c40004f37415d411e..422cadfd5ffd78ae1b8fdf15734e03bd0333b26e:/components/battery.c?ds=inline

diff --git a/components/battery.c b/components/battery.c
index b086a28..bcd42cd 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -5,14 +5,6 @@
 
 #include "../util.h"
 
-static struct {
-	char *state;
-	char *symbol;
-} map[] = {
-	{ "Charging",    "+" },
-	{ "Discharging", "-" },
-};
-
 #if defined(__linux__)
 	#include <limits.h>
 
@@ -22,19 +14,36 @@ static struct {
 		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 *
 	battery_state(const char *bat)
 	{
+		static struct {
+			char *state;
+			char *symbol;
+		} map[] = {
+			{ "Charging",    "+" },
+			{ "Discharging", "-" },
+		};
 		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;
 		}
@@ -54,20 +63,29 @@ static struct {
 		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 (!strcmp(state, "Discharging")) {
-			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-					 bat, "/charge_now");
+			if (esnprintf(path, sizeof(path),
+                                      "/sys/class/power_supply/%s/charge_now",
+			              bat) < 0) {
+				return NULL;
+			}
 			if (pscanf(path, "%d", &charge_now) != 1) {
 				return NULL;
 			}
-			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-					 bat, "/current_now");
+			if (esnprintf(path, sizeof(path),
+			              "/sys/class/power_supply/%s/current_now",
+			              bat) < 0) {
+				return NULL;
+			}
 			if (pscanf(path, "%d", &current_now) != 1) {
 				return NULL;
 			}
@@ -122,6 +140,13 @@ static struct {
 	const char *
 	battery_state(const char *unused)
 	{
+		struct {
+			unsigned int state;
+			char *symbol;
+		} map[] = {
+			{ APM_AC_ON,      "+" },
+			{ APM_AC_OFF,     "-" },
+		};
 		struct apm_power_info apm_info;
 		size_t i;