commit a9ef75c50d35afc115d443ddc7dd35956fc5a2ef
author Richard Levitte <levitte@openssl.org> Thu Jun 01 11:23:20 2000 +0000
committer Richard Levitte <levitte@openssl.org> Thu Jun 01 11:23:20 2000 +0000
tree fe6cfea4197d8798af0a67354e1e58f66f7ad064
parent 7edd20916a35735f809bccd6d595c209814b1c2e

Small fix to enable reading from stdin as well.
Contributed by Yoichiro Okabe <okabe@wizsoft.co.jp>

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index e629f8e..277417e 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -523,7 +523,7 @@
 					tv.tv_usec = 0;
 					i=select(width,(void *)&readfds,(void *)&writefds,
 						 NULL,&tv);
-					if(!i && (!_kbhit() || !read_tty) ) continue;
+					if(!i && (!((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) || !read_tty) ) continue;
 				} else 	i=select(width,(void *)&readfds,(void *)&writefds,
 					 NULL,NULL);
 			}
@@ -689,7 +689,7 @@
 			}
 
 #ifdef WINDOWS
-		else if (_kbhit())
+		else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
 #else
 		else if (FD_ISSET(fileno(stdin),&readfds))
 #endif