Small fix

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 30712432b175e3246463c0a527f7bb43c4099e33..63d1547ba050f0b53f988124cd88157e7c5ba970 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -4,7 +4,17 @@
 #include<unistd.h>
 #include<signal.h>
 #include<X11/Xlib.h>
+#ifdef __OpenBSD__
+#define SIGPLUS                        SIGUSR1+1
+#define SIGMINUS               SIGUSR1-1
+#else
+#define SIGPLUS                        SIGRTMIN
+#define SIGMINUS               SIGRTMIN
+#endif
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH              50
+#define MIN( a, b ) ( ( a < b) ? a : b )
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
        char* icon;
@@ -12,17 +22,18 @@ typedef struct {
        unsigned int interval;
        unsigned int signal;
 } Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
 void sighandler(int num);
-void replace(char *str, char old, char new);
 void getcmds(int time);
-void getsigcmds(int signal);
+void getsigcmds(unsigned int signal);
 void setupsignals();
+void sighandler(int signum);
 int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
-void statusinit();
-void sighandler(int signum);
-void termhandler(int signum);
+void termhandler();
 
 
 #include "blocks.h"
@@ -30,21 +41,10 @@ void termhandler(int signum);
 static Display *dpy;
 static int screen;
 static Window root;
-static char statusbar[LENGTH(blocks)][50] = {0};
-static char statusstr[2][256];
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
-<<<<<<< HEAD
 static void (*writestatus) () = setroot;
-=======
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
-
-void replace(char *str, char old, char new)
-{
-       int N = strlen(str);
-       for(int i = 0; i < N; i++)
-               if(str[i] == old)
-                       str[i] = new;
-}
 
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
@@ -56,29 +56,30 @@ void getcmd(const Block *block, char *output)
                return;
        char c;
        int i = strlen(block->icon);
-       while((c = fgetc(cmdf)) != EOF)
-               output[i++] = c;
-       if (delim != '\0' && --i)
-               output[i++] = delim;
-       output[i++] = '\0';
+       fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
+       i = strlen(output);
+       if (delim[0] != '\0' && --i)
+                strncpy(output+i, delim, delimLen); 
+       else
+               output[i++] = '\0';
        pclose(cmdf);
 }
 
 void getcmds(int time)
 {
        const Block* current;
-       for(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)
                        getcmd(current,statusbar[i]);
        }
 }
 
-void getsigcmds(int signal)
+void getsigcmds(unsigned int signal)
 {
        const Block *current;
-       for (int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
        {
                current = blocks + i;
                if (current->signal == signal)
@@ -88,10 +89,16 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
-       for(int i = 0; i < LENGTH(blocks); i++)
-       {         
+#ifndef __OpenBSD__
+           /* initialize all real time signals with dummy handler */
+    for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+        signal(i, dummysighandler);
+#endif
+
+       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       {
                if (blocks[i].signal > 0)
-                       signal(SIGRTMIN+blocks[i].signal, sighandler);
+                       signal(SIGMINUS+blocks[i].signal, sighandler);
        }
 
 }
@@ -99,21 +106,10 @@ void setupsignals()
 int getstatus(char *str, char *last)
 {
        strcpy(last, str);
-<<<<<<< HEAD
        str[0] = '\0';
-       for(int i = 0; i < LENGTH(blocks); i++)
-=======
-       int j = 0;
-       for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
-       {       
+       for(unsigned int i = 0; i < LENGTH(blocks); i++)
                strcat(str, statusbar[i]);
-       }
-<<<<<<< HEAD
-       str[strlen(str)-1] = '\0';
-=======
-       str[--j] = '\0';
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
+       str[strlen(str)-strlen(delim)] = '\0';
        return strcmp(str, last);//0 if they are the same
 }
 
@@ -154,34 +150,36 @@ void statusloop()
        }
 }
 
-void statusinit()
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
 {
-       statusloop();
+    return;
 }
-
+#endif
 
 void sighandler(int signum)
 {
-       getsigcmds(signum-SIGRTMIN);
+       getsigcmds(signum-SIGPLUS);
        writestatus();
 }
 
-void termhandler(int signum)
+void termhandler()
 {
        statusContinue = 0;
-       exit(0);
 }
 
 int main(int argc, char** argv)
 {
        for(int i = 0; i < argc; i++)
-       {       
+       {
                if (!strcmp("-d",argv[i]))
-                       delim = argv[++i][0];
+                       strncpy(delim, argv[++i], delimLen);
                else if(!strcmp("-p",argv[i]))
                        writestatus = pstdout;
        }
+       delim[MIN(delimLen++, strlen(delim))] = '\0';
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
-       statusinit();
+       statusloop();
 }