X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=266dd150f5c697f9d6e5c047823280e5b3b2e063;hb=af4667a85a11a1c001e60894a7ec7458c208bc0d;hp=257edcc81706d327fc52a9cc860f054db1d2358c;hpb=6f60b2e1cd74c881688617082dc292b5c89da1a1;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 257edcc..266dd15 100644
--- 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,22 +1300,12 @@ 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';
-				readin = False;
-				break;
-			case 0:
+			if((readin = (stext == fgets(stext, sizeof stext - 1, stdin))))
+				stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
+			else if(feof(stdin))
 				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);
-			}
+			else /* error occured */
+				strncpy(stext, strerror(errno), sizeof stext - 1);
 			drawbar();
 		}
 		while(XPending(dpy)) {