made error handling more proper

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index e07574a..c595a51 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -1280,15 +1280,15 @@ restack(void) {
 
 void
 run(void) {
-       char *p;
-       int r, xfd;
        fd_set rd;
+       int xfd;
        XEvent ev;
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
        readin = True;
+       stext[sizeof stext - 1] = '\0'; /* 0-terminator is never touched */
        while(running) {
                FD_ZERO(&rd);
                if(readin)
@@ -1300,21 +1300,14 @@ run(void) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-                       case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
+                       if(stext == fgets(stext, sizeof stext - 1, stdin))
+                               stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
+                       else {
                                readin = False;
-                               break;
-                       case 0:
-                               strncpy(stext, "EOF", 4);
-                               readin = False;
-                               break;
-                       default:
-                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(; p >= stext && *p != '\n'; --p);
-                               if(p > stext)
-                                       strncpy(stext, p + 1, sizeof stext);
+                               if(feof(stdin))
+                                       strncpy(stext, "EOF", 4);
+                               else /* error occured */
+                                       strncpy(stext, strerror(errno), sizeof stext - 1);
                        }
                        drawbar();
                }
@@ -1584,8 +1577,8 @@ tile(void) {
                        else
                                nh = th - 2 * c->border;
                }
-               resize(c, nx, ny, nw, nh, True);
-               if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
+               resize(c, nx, ny, nw, nh, RESIZEHINTS);
+               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
                        /* client doesn't accept size constraints */
                        resize(c, nx, ny, nw, nh, False);
                if(n > 1 && th != wah)