Merge pull request #29 from keikari/patch-2

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 5abd10d..e3e34a1 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -50,16 +50,17 @@ static void (*writestatus) () = setroot;
 void getcmd(const Block *block, char *output)
 {
        strcpy(output, block->icon);
-       char *cmd = block->command;
-       FILE *cmdf = popen(cmd,"r");
+       FILE *cmdf = popen(block->command, "r");
        if (!cmdf)
                return;
-       char c;
        int i = strlen(block->icon);
        fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
        i = strlen(output);
-       if (delim[0] != '\0' && --i)
-                strncpy(output+i, delim, delimLen); 
+       if (delim[0] != '\0') {
+               //only chop off newline if one is present at the end
+               i = output[i-1] == '\n' ? i-1 : i;
+               strncpy(output+i, delim, delimLen); 
+       }
        else
                output[i++] = '\0';
        pclose(cmdf);
@@ -177,7 +178,8 @@ int main(int argc, char** argv)
                else if (!strcmp("-p",argv[i]))
                        writestatus = pstdout;
        }
-       delim[MIN(delimLen, strlen(delim))] = '\0';
+       delimLen = MIN(delimLen, strlen(delim));
+       delim[delimLen++] = '\0';
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
        statusloop();