X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/931e712eac3dad86e9447944ac70f7b238f8a58d..27ef73507b69608c63bd7d1684b7d9987fbcce53:/main.c

diff --git a/main.c b/main.c
index f114bae..86cd3f9 100644
--- a/main.c
+++ b/main.c
@@ -267,22 +267,30 @@ main(int argc, char *argv[]) {
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
-		r = select(xfd + 1, &rd, NULL, NULL, NULL);
-		if((r == -1) && (errno == EINTR))
-			continue;
-		if(r > 0) {
-			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();
+		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+			if(errno == EINTR)
+				continue;
+			else
+				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));
+				stext[sizeof(stext) - 1] = '\0';
+				readin = False;
+				break;
+			case 0:
+				strncpy(stext, "EOF", sizeof(stext));
+				readin = False;
+				break;
+			default:
+				stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
 			}
+			drawstatus();
 		}
-		else if(r < 0)
-			eprint("select failed\n");
-		procevent();
+		if(FD_ISSET(xfd, &rd))
+			procevent();
 	}
 	cleanup();
 	XCloseDisplay(dpy);