Change to fmt_human in netspeeds on OpenBSD

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index bcd42cd..8bfe42a 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -7,6 +7,29 @@
 
 #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)
@@ -60,7 +83,7 @@
        battery_remaining(const char *bat)
        {
                int charge_now, current_now, m, h;
-               float timeleft;
+               double timeleft;
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
@@ -72,27 +95,25 @@
                        return NULL;
                }
 
+               if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
+                   pscanf(path, "%d", &charge_now) < 0) {
+                       return NULL;
+               }
+
                if (!strcmp(state, "Discharging")) {
-                       if (esnprintf(path, sizeof(path),
-                                      "/sys/class/power_supply/%s/charge_now",
-                                     bat) < 0) {
+                       if (!pick(bat, CURRENT_NOW, POWER_NOW, path,
+                                 sizeof(path)) ||
+                           pscanf(path, "%d", &current_now) < 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) {
+
+                       if (current_now == 0) {
                                return NULL;
                        }
 
-                       timeleft = (float)charge_now / (float)current_now;
+                       timeleft = (double)charge_now / (double)current_now;
                        h = timeleft;
-                       m = (timeleft - (float)h) * 60;
+                       m = (timeleft - (double)h) * 60;
 
                        return bprintf("%dh %dm", h, m);
                }
@@ -169,7 +190,8 @@
 
                if (load_apm_power_info(&apm_info)) {
                        if (apm_info.ac_state != APM_AC_ON) {
-                               return bprintf("%uh %02um", apm_info.minutes_left / 60,
+                               return bprintf("%uh %02um",
+                                              apm_info.minutes_left / 60,
                                               apm_info.minutes_left % 60);
                        } else {
                                return "";