fixed issue causing segfault on ARM systems

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 71760aa..f7f23cc 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -33,6 +33,7 @@ static Window root;
 static char statusbar[LENGTH(blocks)][50] = {0};
 static char statusstr[2][256];
 static int statusContinue = 1;
+static void (*writestatus) () = setroot;
 
 void replace(char *str, char old, char new)
 {
@@ -50,11 +51,14 @@ void getcmd(const Block *block, char *output)
        FILE *cmdf = popen(cmd,"r");
        if (!cmdf)
                return;
-       //int N = strlen(output);
        char c;
        int i = strlen(block->icon);
        while((c = fgetc(cmdf)) != EOF)
+       {
                output[i++] = c;
+               if(c == '\n')
+                       break;
+       }
        if (delim != '\0' && --i)
                output[i++] = delim;
        output[i++] = '\0';
@@ -96,12 +100,12 @@ void setupsignals()
 int getstatus(char *str, char *last)
 {
        strcpy(last, str);
-       int j = 0;
-       for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
+       str[0] = '\0';
+       for(int i = 0; i < LENGTH(blocks); i++)
        {       
-               strcpy(str + j, statusbar[i]);
+               strcat(str, statusbar[i]);
        }
-       str[--j] = '\0';
+       str[strlen(str)-1] = '\0';
        return strcmp(str, last);//0 if they are the same
 }
 
@@ -119,6 +123,14 @@ void setroot()
        XCloseDisplay(dpy);
 }
 
+void pstdout()
+{
+       if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+               return;
+       printf("%s\n",statusstr[0]);
+       fflush(stdout);
+}
+
 
 void statusloop()
 {
@@ -128,7 +140,7 @@ void statusloop()
        while(statusContinue)
        {
                getcmds(i);
-               setroot();
+               writestatus();
                sleep(1.0);
                i++;
        }
@@ -143,7 +155,7 @@ void statusinit()
 void sighandler(int signum)
 {
        getsigcmds(signum-SIGRTMIN);
-       setroot();
+       writestatus();
 }
 
 void termhandler(int signum)
@@ -158,6 +170,8 @@ int main(int argc, char** argv)
        {       
                if (!strcmp("-d",argv[i]))
                        delim = argv[++i][0];
+               else if(!strcmp("-p",argv[i]))
+                       writestatus = pstdout;
        }
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);