Remove initialization to 0 for static vars

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 84b2c11..5031608 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -14,15 +14,22 @@
                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;
+               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)
        {
-               struct {
+               static struct {
                        char *state;
                        char *symbol;
                } map[] = {
@@ -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;
                }
@@ -49,8 +59,45 @@
        const char *
        battery_remaining(const char *bat)
        {
-               /* TODO: Implement */
-               return NULL;
+               int charge_now, current_now, m, h;
+               float timeleft;
+               char path[PATH_MAX], state[12];
+
+               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")) {
+                       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;
+                       }
+                       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;
+                       }
+
+                       timeleft = (float)charge_now / (float)current_now;
+                       h = timeleft;
+                       m = (timeleft - (float)h) * 60;
+
+                       return bprintf("%dh %dm", h, m);
+               }
+
+               return "";
        }
 #elif defined(__OpenBSD__)
        #include <fcntl.h>
@@ -84,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;
@@ -93,8 +140,6 @@
        const char *
        battery_state(const char *unused)
        {
-               struct apm_power_info apm_info;
-               size_t i;
                struct {
                        unsigned int state;
                        char *symbol;
@@ -102,6 +147,8 @@
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },
                };
+               struct apm_power_info apm_info;
+               size_t i;
 
                if (load_apm_power_info(&apm_info)) {
                        for (i = 0; i < LEN(map); i++) {
@@ -122,10 +169,10 @@
 
                if (load_apm_power_info(&apm_info)) {
                        if (apm_info.ac_state != APM_AC_ON) {
-                               return bprintf("%u:%02u", apm_info.minutes_left / 60,
+                               return bprintf("%uh %02um", apm_info.minutes_left / 60,
                                               apm_info.minutes_left % 60);
                        } else {
-                               return strdup("");
+                               return "";
                        }
                }