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

diff --git a/components/battery.c b/components/battery.c
index 90e8590..5031608 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -14,9 +14,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 +39,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,20 +63,29 @@
 		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;
 			}
@@ -112,7 +131,7 @@
 		struct apm_power_info apm_info;
 
 		if (load_apm_power_info(&apm_info)) {
-			return bprintf("%d", apm_info.battery_life);
+			return bprintf("%d%%", apm_info.battery_life);
 		}
 
 		return NULL;