Removed call to redundant call to exit()

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 8668f042d77bea8510570564fe82f78de5bc5463..0de8630ea50d8f7d8c0e869897492855b5490647 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -4,8 +4,16 @@
 #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 STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
        char* icon;
@@ -13,14 +21,14 @@ typedef struct {
        unsigned int interval;
        unsigned int signal;
 } Block;
+#ifndef __OpenBSD__
 void dummysighandler(int num);
+#endif
 void sighandler(int num);
 void getcmds(int time);
-#ifndef __OpenBSD__
 void getsigcmds(int signal);
 void setupsignals();
 void sighandler(int signum);
-#endif
 int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
@@ -33,7 +41,7 @@ static Display *dpy;
 static int screen;
 static Window root;
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
+static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
 static void (*writestatus) () = setroot;
 
@@ -66,7 +74,6 @@ void getcmds(int time)
        }
 }
 
-#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
        const Block *current;
@@ -80,18 +87,19 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
-    /* initialize all real time signals with dummy handler */
+#ifndef __OpenBSD__
+           /* initialize all real time signals with dummy handler */
     for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
         signal(i, dummysighandler);
+#endif
 
        for(int i = 0; i < LENGTH(blocks); i++)
        {
                if (blocks[i].signal > 0)
-                       signal(SIGRTMIN+blocks[i].signal, sighandler);
+                       signal(SIGMINUS+blocks[i].signal, sighandler);
        }
 
 }
-#endif
 
 int getstatus(char *str, char *last)
 {
@@ -128,9 +136,7 @@ void pstdout()
 
 void statusloop()
 {
-#ifndef __OpenBSD__
        setupsignals();
-#endif
        int i = 0;
        getcmds(-1);
        while(statusContinue)
@@ -150,18 +156,15 @@ void dummysighandler(int signum)
 }
 #endif
 
-#ifndef __OpenBSD__
 void sighandler(int signum)
 {
-       getsigcmds(signum-SIGRTMIN);
+       getsigcmds(signum-SIGPLUS);
        writestatus();
 }
-#endif
 
 void termhandler(int signum)
 {
        statusContinue = 0;
-       exit(0);
 }
 
 int main(int argc, char** argv)