X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=33a2a9a0227a36fb922159a8764ed3995a3742f2;hb=95e8d12b7189d4cd01b8ae8ecebfa5835a1809e6;hp=86d72fadb42ad765509291fd73899b9e4d9a2926;hpb=0cf3ba0eab1e3b05515907b29fbb739321a7cbed;p=dwm.git diff --git a/main.c b/main.c index 86d72fa..33a2a9a 100644 --- a/main.c +++ b/main.c @@ -4,7 +4,6 @@ */ #include "dwm.h" - #include #include #include @@ -15,7 +14,6 @@ #include #include - /* static */ static int (*xerrorxlib)(Display *, XErrorEvent *); @@ -165,6 +163,7 @@ main(int argc, char *argv[]) int i; unsigned int mask; fd_set rd; + Bool readin = True; Window w; XEvent ev; XSetWindowAttributes wa; @@ -251,7 +250,8 @@ main(int argc, char *argv[]) /* main event loop, reads status text from stdin as well */ while(running) { FD_ZERO(&rd); - FD_SET(STDIN_FILENO, &rd); + if(readin) + FD_SET(STDIN_FILENO, &rd); FD_SET(ConnectionNumber(dpy), &rd); i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0); @@ -267,11 +267,12 @@ main(int argc, char *argv[]) (handler[ev.type])(&ev); /* call handler */ } } - if(FD_ISSET(STDIN_FILENO, &rd)) { - if(!fgets(stext, sizeof(stext), stdin)) - break; - else + if(readin && FD_ISSET(STDIN_FILENO, &rd)) { + readin = NULL != fgets(stext, sizeof(stext), stdin); + if(readin) stext[strlen(stext) - 1] = 0; + else + strcpy(stext, "broken pipe"); drawstatus(); } }