From 98cab0e9ad51eed4c04456f6f9ab888b33fb9ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 31 Oct 2011 04:17:35 +0100
Subject: [PATCH] Really fix linux Console.

---
 library/Console-linux.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/library/Console-linux.cpp b/library/Console-linux.cpp
index 083d4197b..d74c48045 100644
--- a/library/Console-linux.cpp
+++ b/library/Console-linux.cpp
@@ -143,22 +143,25 @@ namespace DFHack
     private:
         bool read_char(unsigned char & out)
         {
-            while(1)
+            FD_ZERO(&descriptor_set);
+            FD_SET(STDIN_FILENO, &descriptor_set);
+            FD_SET(exit_pipe[0], &descriptor_set);
+            int ret = TEMP_FAILURE_RETRY(
+                select (FD_SETSIZE,&descriptor_set, NULL, NULL, NULL)
+            );
+            if(ret == -1)
+                return false;
+            if (FD_ISSET(exit_pipe[0], &descriptor_set))
+                return false;
+            if (FD_ISSET(STDIN_FILENO, &descriptor_set))
             {
-                while (select(FD_SETSIZE, &descriptor_set, NULL, NULL, NULL) < 0)
-                {
-                    if(errno == EINTR)
-                        continue;
-                    return false;
-                }
-                if (FD_ISSET(STDIN_FILENO, &descriptor_set))
-                {
-                    // read byte from stdin
-                    read(STDIN_FILENO, &out, 1);
-                    return true;
-                }
-                if (FD_ISSET(exit_pipe[0], &descriptor_set))
+                // read byte from stdin
+                ret = TEMP_FAILURE_RETRY(
+                    read(STDIN_FILENO, &out, 1)
+                );
+                if(ret == -1)
                     return false;
+                return true;
             }
         }
     protected: