hostname() null terminaiton subtraction *is* needed

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 69fb6a5..572f964 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -116,15 +116,9 @@ battery_perc(const char *battery)
 static char *
 battery_state(const char *battery)
 {
 static char *
 battery_state(const char *battery)
 {

-       char *state[12]; 
+       char state[12]; 

        FILE *fp;
 
        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) {
        ccat(3, "/sys/class/power_supply/", battery, "/status");
        fp = fopen(concat, "r");
        if (fp == NULL) {


@@ -279,7 +273,7 @@ hostname(void)
 
        fgets(hostname, sizeof(hostname), fp);
        /* FIXME: needs improvement */
 
        fgets(hostname, sizeof(hostname), fp);
        /* FIXME: needs improvement */

-       memset(&hostname[strlen(hostname)], '\0',
+       memset(&hostname[strlen(hostname)-1], '\0',

                sizeof(hostname) - strlen(hostname));
        fclose(fp);
 
                sizeof(hostname) - strlen(hostname));
        fclose(fp);
 


@@ -607,7 +601,7 @@ main(void)
 {
        unsigned short int i;
        char status_string[4096];
 {
        unsigned short int i;
        char status_string[4096];

-       char *res, *element, *status_old;
+       char *res, *element;

        struct arg argument;
        struct sigaction act;
 
        struct arg argument;
        struct sigaction act;