Merge branch 'master' of https://github.com/drkh5h/slstatus

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index fa91cce..840ceb0 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -40,6 +40,7 @@ struct arg {
 
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
+static char *battery_state(const char *);
 static char *cpu_perc(void);
 static char *datetime(const char *);
 static char *disk_free(const char *);
@@ -113,6 +114,37 @@ battery_perc(const char *battery)
        return smprintf("%d%%", perc);
 }
 
+static char *
+battery_state(const char *battery)
+{
+       char *state = malloc(sizeof(char)*12);
+       FILE *fp;
+
+       if (!state) {
+               warn("Failed to get battery state.");
+               return smprintf(UNKNOWN_STR);
+       }
+
+
+       ccat(3, "/sys/class/power_supply/", battery, "/status");
+       fp = fopen(concat, "r");
+       if (fp == NULL) {
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);
+       }
+       fscanf(fp, "%s", state);
+       fclose(fp);
+
+       if (strcmp(state, "Charging") == 0)
+               return smprintf("+");
+       else if (strcmp(state, "Discharging") == 0)
+               return smprintf("-");
+       else if (strcmp(state, "Full") == 0)
+               return smprintf("=");
+       else
+               return smprintf("?");
+}
+
 static char *
 cpu_perc(void)
 {
@@ -248,7 +280,7 @@ hostname(void)
 
        fgets(hostname, sizeof(hostname), fp);
        /* FIXME: needs improvement */
-       memset(&hostname[strlen(hostname)-1], '\0',
+       memset(&hostname[strlen(hostname)], '\0',
                sizeof(hostname) - strlen(hostname));
        fclose(fp);