ram: Consistency with line breaks

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index bcd42cd..1178f20 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <errno.h>

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -7,6 +6,25 @@
 
 #if defined(__linux__)
        #include <limits.h>
 
 #if defined(__linux__)
        #include <limits.h>

+       #include <stdint.h>
+       #include <unistd.h>
+
+       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)
 
        const char *
        battery_perc(const char *bat)


@@ -15,8 +33,7 @@
                char path[PATH_MAX];
 
                if (esnprintf(path, sizeof(path),
                char path[PATH_MAX];
 
                if (esnprintf(path, sizeof(path),

-                             "/sys/class/power_supply/%s/capacity",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/capacity", bat) < 0) {

                        return NULL;
                }
                if (pscanf(path, "%d", &perc) != 1) {
                        return NULL;
                }
                if (pscanf(path, "%d", &perc) != 1) {


@@ -40,8 +57,7 @@
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),

-                             "/sys/class/power_supply/%s/status",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/status", bat) < 0) {

                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {


@@ -59,42 +75,42 @@
        const char *
        battery_remaining(const char *bat)
        {
        const char *
        battery_remaining(const char *bat)
        {

-               int charge_now, current_now, m, h;
-               float timeleft;
+               uintmax_t charge_now, current_now, m, h;
+               double timeleft;

                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),

-                             "/sys/class/power_supply/%s/status",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/status", bat) < 0) {

                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }
 
                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }
 

+               if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
+                         "/sys/class/power_supply/%s/energy_now", path,
+                         sizeof(path)) ||
+                   pscanf(path, "%ju", &charge_now) < 0) {
+                       return NULL;
+               }
+

                if (!strcmp(state, "Discharging")) {
                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) {
+                       if (!pick(bat, "/sys/class/power_supply/%s/current_now",
+                                 "/sys/class/power_supply/%s/power_now", path,
+                                 sizeof(path)) ||
+                           pscanf(path, "%ju", &current_now) < 0) {

                                return NULL;
                        }
                                return NULL;
                        }

-                       if (pscanf(path, "%d", &current_now) != 1) {
+
+                       if (current_now == 0) {

                                return NULL;
                        }
 
                                return NULL;
                        }
 

-                       timeleft = (float)charge_now / (float)current_now;
+                       timeleft = (double)charge_now / (double)current_now;

                        h = timeleft;
                        h = timeleft;

-                       m = (timeleft - (float)h) * 60;
+                       m = (timeleft - (double)h) * 60;

 
 

-                       return bprintf("%dh %dm", h, m);
+                       return bprintf("%juh %jum", h, m);

                }
 
                return "";
                }
 
                return "";


@@ -169,7 +185,8 @@
 
                if (load_apm_power_info(&apm_info)) {
                        if (apm_info.ac_state != APM_AC_ON) {
 
                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 "";
                                               apm_info.minutes_left % 60);
                        } else {
                                return "";