1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openssl: fix keypress requirement in apps on win32

Browse Source 
Reapply b910613792dac946b295855963869933a9089044 .

Backport-PR-URL: https://github.com/nodejs/node/pull/19638
Fixes: https://github.com/iojs/io.js/issues/589
PR-URL: https://github.com/iojs/io.js/pull/1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Shigeki Ohtsu 2015-02-17 11:30:28 +09:00 committed by Myles Borins
parent aee5fbfe5c
commit 5aa53cbf40
No known key found for this signature in database
GPG Key ID: 933B01F40B5CA946
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps/openssl/openssl/apps/s_client.c vendored
View File

@ -180,6 +180,13 @@ typedef unsigned int u_int;
# include <fcntl.h> # include <fcntl.h>
#endif #endif
/* Use Windows API with STD_INPUT_HANDLE when checking for input?
Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if
OPENSSL_SYS_WINDOWS is defined */
#if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE)
#define OPENSSL_USE_STD_INPUT_HANDLE
#endif
#undef PROG #undef PROG
#define PROG s_client_main #define PROG s_client_main
@ -1793,10 +1800,7 @@ int MAIN(int argc, char **argv)
tv.tv_usec = 0; tv.tv_usec = 0;
i = select(width, (void *)&readfds, (void *)&writefds, i = select(width, (void *)&readfds, (void *)&writefds,
NULL, &tv); NULL, &tv);
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS) #if defined(OPENSSL_USE_STD_INPUT_HANDLE)
if (!i && (!_kbhit() || !read_tty))
continue;
# else
if (!i && (!((_kbhit()) if (!i && (!((_kbhit())
|| (WAIT_OBJECT_0 == || (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle WaitForSingleObject(GetStdHandle
@ -1804,6 +1808,8 @@ int MAIN(int argc, char **argv)
0))) 0)))
|| !read_tty)) || !read_tty))
continue; continue;
#else
if(!i && (!_kbhit() || !read_tty) ) continue;
# endif # endif
} else } else
i = select(width, (void *)&readfds, (void *)&writefds, i = select(width, (void *)&readfds, (void *)&writefds,
@ -2005,12 +2011,12 @@ int MAIN(int argc, char **argv)
} }
} }
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS) #if defined(OPENSSL_USE_STD_INPUT_HANDLE)
else if (_kbhit())
# else
else if ((_kbhit()) else if ((_kbhit())
|| (WAIT_OBJECT_0 == || (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
#else
else if (_kbhit())
# endif # endif
#elif defined (OPENSSL_SYS_NETWARE) #elif defined (OPENSSL_SYS_NETWARE)
else if (_kbhit()) else if (_kbhit())