Clean up header includes

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index b086a28..99e09d5 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,20 +1,34 @@
 /* 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 "../util.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../util.h"
 

-static struct {
-       char *state;
-       char *symbol;
-} map[] = {
-       { "Charging",    "+" },
-       { "Discharging", "-" },
-};
-

 #if defined(__linux__)
        #include <limits.h>
 #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)
 
        const char *
        battery_perc(const char *bat)


@@ -22,19 +36,36 @@ static struct {
                int perc;
                char path[PATH_MAX];
 
                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)
        {
        }
 
        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];
 
                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;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }


@@ -51,30 +82,37 @@ static struct {
        battery_remaining(const char *bat)
        {
                int charge_now, current_now, m, h;
        battery_remaining(const char *bat)
        {
                int charge_now, current_now, m, h;

-               float timeleft;
+               double timeleft;

                char path[PATH_MAX], state[12];
 
                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 (pscanf(path, "%12s", state) != 1) {
                        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 (!strcmp(state, "Discharging")) {

-                       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-                                        bat, "/charge_now");
-                       if (pscanf(path, "%d", &charge_now) != 1) {
+                       if (!pick(bat, CURRENT_NOW, POWER_NOW, path,
+                                 sizeof(path)) ||
+                           pscanf(path, "%d", &current_now) < 0) {

                                return NULL;
                        }
                                return NULL;
                        }

-                       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-                                        bat, "/current_now");
-                       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("%dh %dm", h, m);
                }


@@ -122,6 +160,13 @@ static struct {
        const char *
        battery_state(const char *unused)
        {
        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;
 
                struct apm_power_info apm_info;
                size_t i;
 


@@ -144,7 +189,8 @@ static struct {
 
                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 "";