removed fgets usage, increment offset until a line is read, dwm will drop all lines...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 257edcc..044177d 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -1145,6 +1145,7 @@ quit(const char *arg) {
        readin = running = False;
 }
 
+
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        XWindowChanges wc;
@@ -1281,14 +1282,18 @@ restack(void) {
 void
 run(void) {
        char *p;
-       int r, xfd;
        fd_set rd;
+       int r, xfd;
+       unsigned int len, offset;
        XEvent ev;
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
        readin = True;
+       offset = 0;
+       len = sizeof stext - 1;
+       stext[len] = '\0'; /* 0-terminator is never touched */
        while(running) {
                FD_ZERO(&rd);
                if(readin)
@@ -1300,10 +1305,9 @@ run(void) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+                       switch((r = read(STDIN_FILENO, stext + offset, len - offset))) {
                        case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
+                               strncpy(stext, strerror(errno), len);
                                readin = False;
                                break;
                        case 0:
@@ -1311,10 +1315,16 @@ run(void) {
                                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);
+                               stext[offset + r] = '\0';
+                               for(p = stext; *p && *p != '\n'; p++);
+                               if(*p == '\n') {
+                                       *p = '\0';
+                                       offset = 0;
+                               }
+                               else if(offset + r < len - 1)
+                                       offset += r;
+                               else
+                                       offset = 0;
                        }
                        drawbar();
                }