From 478f6f95f1cb349e93bfe49ae6721c222c3a1a6d Mon Sep 17 00:00:00 2001
From: "arg@mig29" <unknown>
Date: Sat, 25 Nov 2006 19:26:16 +0100
Subject: applied Manuels patch (thanks to Manuel!)

---
 main.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index f114bae..750366e 100644
--- a/main.c
+++ b/main.c
@@ -267,22 +267,29 @@ 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))) {
+			case -1:
+				strncpy(stext, strerror(errno), sizeof(stext));
+				readin = False;
+				break;
+			case 0:
+				strncpy(stext, "EOF", sizeof(stext));
+				readin = False;
+				break;
+			default:
+				stext[r-1] = 0;
 			}
+			drawstatus();
 		}
-		else if(r < 0)
-			eprint("select failed\n");
-		procevent();
+		if(FD_ISSET(xfd, &rd))
+			procevent();
 	}
 	cleanup();
 	XCloseDisplay(dpy);
-- 
cgit v1.2.3-13-gbd6f