Commit e3915a4
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -180,6 +180,13 @@ typedef unsigned int u_int; | |||
| 180 | 180 | # include <fcntl.h> | |
| 181 | 181 | #endif | |
| 182 | 182 | ||
| 183 | + /* Use Windows API with STD_INPUT_HANDLE when checking for input? | ||
| 184 | + Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if | ||
| 185 | + OPENSSL_SYS_WINDOWS is defined */ | ||
| 186 | + #if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE) | ||
| 187 | + #define OPENSSL_USE_STD_INPUT_HANDLE | ||
| 188 | + #endif | ||
| 189 | + | ||
| 183 | 190 | #undef PROG | |
| 184 | 191 | #define PROG s_client_main | |
| 185 | 192 | ||
@@ -1790,17 +1797,16 @@ int MAIN(int argc, char **argv) | |||
| 1790 | 1797 | tv.tv_usec = 0; | |
| 1791 | 1798 | i = select(width, (void *)&readfds, (void *)&writefds, | |
| 1792 | 1799 | NULL, &tv); | |
| 1793 | - # if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS) | ||
| 1794 | - if (!i && (!_kbhit() || !read_tty)) | ||
| 1795 | - continue; | ||
| 1796 | - # else | ||
| 1800 | + #if defined(OPENSSL_USE_STD_INPUT_HANDLE) | ||
| 1797 | 1801 | if (!i && (!((_kbhit()) | |
| 1798 | 1802 | || (WAIT_OBJECT_0 == | |
| 1799 | 1803 | WaitForSingleObject(GetStdHandle | |
| 1800 | 1804 | (STD_INPUT_HANDLE), | |
| 1801 | 1805 | 0))) | |
| 1802 | 1806 | || !read_tty)) | |
| 1803 | 1807 | continue; | |
| 1808 | + #else | ||
| 1809 | + if(!i && (!_kbhit() || !read_tty) ) continue; | ||
| 1804 | 1810 | # endif | |
| 1805 | 1811 | } else | |
| 1806 | 1812 | i = select(width, (void *)&readfds, (void *)&writefds, | |
@@ -2002,12 +2008,12 @@ int MAIN(int argc, char **argv) | |||
| 2002 | 2008 | } | |
| 2003 | 2009 | } | |
| 2004 | 2010 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) | |
| 2005 | - # if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS) | ||
| 2006 | - else if (_kbhit()) | ||
| 2007 | - # else | ||
| 2011 | + #if defined(OPENSSL_USE_STD_INPUT_HANDLE) | ||
| 2008 | 2012 | else if ((_kbhit()) | |
| 2009 | 2013 | || (WAIT_OBJECT_0 == | |
| 2010 | 2014 | WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) | |
| 2015 | + #else | ||
| 2016 | + else if (_kbhit()) | ||
| 2011 | 2017 | # endif | |
| 2012 | 2018 | #elif defined (OPENSSL_SYS_NETWARE) | |
| 2013 | 2019 | else if (_kbhit()) | |
0 commit comments