Remove units from numbers

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index b086a28..ff06f40 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -5,16 +5,28 @@
 
 #include "../util.h"
 
-static struct {
-       char *state;
-       char *symbol;
-} map[] = {
-       { "Charging",    "+" },
-       { "Discharging", "-" },
-};
-
 #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)
@@ -22,19 +34,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,21 +83,23 @@ 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 (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;
                        }
 
@@ -122,6 +153,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;