Merge pull request #29 from keikari/patch-2

Fix, delimLen caused weird behaviour

diff --git a/Makefile b/Makefile
index 3cfa764b2026d47fcee7b27cbb05af2f26025a13..8b3a30e01f5da77d38bef24832d70e3cd7e591ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 PREFIX ?= /usr/local
+CC ?= cc
 
 output: dwmblocks.c blocks.def.h blocks.h
-       cc `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
+       ${CC} `pkg-config --cflags x11 --libs x11` dwmblocks.c -o dwmblocks
 blocks.h:
        cp blocks.def.h $@
 

diff --git a/README.md b/README.md
index 33f4e9de34b1b2bdf59161e0ff383d21895aec6f..00896ed4ce24db01a2f3e32d2de0166f7e39b974 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ This is so you can edit your status bar commands and they will not get overwritt
 Here are some patches to dwmblocks that add features that I either don't want to merge in, or that require a dwm patch to work.
 I do not maintain these but I will take pull requests to update them.
 <br>
-<a href=https://gist.github.com/torrinfail/fb423345f0f9c340db25181c8159cdd2>dwmblocks-statuscmd-signal.diff</a>
+<a href=https://gist.github.com/toniz4/41d168719e22bf7bc4ecff09d424b7d2>dwmblocks-statuscmd-20200717-941f415.diff</a>

diff --git a/dwmblocks.c b/dwmblocks.c
index 2014eee2364b50af66dd65e325bbc906c5567eff..e3e34a18878b825764c83ebf107ff53165f01302 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);
@@ -68,7 +69,7 @@ void getcmd(const Block *block, char *output)
 void getcmds(int time)
 {
        const Block* current;
-       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
        {
                current = blocks + i;
                if ((current->interval != 0 && time % current->interval == 0) || time == -1)
@@ -91,11 +92,11 @@ void setupsignals()
 {
 #ifndef __OpenBSD__
            /* initialize all real time signals with dummy handler */
-    for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
         signal(i, dummysighandler);
 #endif
 
-       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
        {
                if (blocks[i].signal > 0)
                        signal(SIGMINUS+blocks[i].signal, sighandler);
@@ -107,7 +108,7 @@ int getstatus(char *str, char *last)
 {
        strcpy(last, str);
        str[0] = '\0';
-       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
                strcat(str, statusbar[i]);
        str[strlen(str)-strlen(delim)] = '\0';
        return strcmp(str, last);//0 if they are the same
@@ -141,12 +142,11 @@ void statusloop()
        setupsignals();
        int i = 0;
        getcmds(-1);
-       while(statusContinue)
+       while (statusContinue)
        {
-               getcmds(i);
+               getcmds(i++);
                writestatus();
                sleep(1.0);
-               i++;
        }
 }
 
@@ -171,11 +171,11 @@ void termhandler()
 
 int main(int argc, char** argv)
 {
-       for(int i = 0; i < argc; i++)
+       for (int i = 0; i < argc; i++) //Handle command line arguments
        {
                if (!strcmp("-d",argv[i]))
                        strncpy(delim, argv[++i], delimLen);
-               else if(!strcmp("-p",argv[i]))
+               else if (!strcmp("-p",argv[i]))
                        writestatus = pstdout;
        }
        delimLen = MIN(delimLen, strlen(delim));