MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Really fix linux Console.

develop
Petr Mrázek 2011-10-31 04:17:35 +01:00
parent 84e1a95205
commit 98cab0e9ad
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
library/Console-linux.cpp
Unescape Escape View File

@ -143,22 +143,25 @@ namespace DFHack
private: private:
bool read_char(unsigned char & out) 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) // read byte from stdin
{ ret = TEMP_FAILURE_RETRY(
if(errno == EINTR) read(STDIN_FILENO, &out, 1)
continue; );
return false; if(ret == -1)
}
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))
return false; return false;
return true;
} }
} }
protected: protected: