Module Name: src
Committed By: christos
Date: Sun Mar 22 19:56:07 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist/apps: s_client.c s_server.c
Log Message:
always use fdin
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/external/bsd/openssl/dist/apps/s_client.c
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/apps/s_client.c
diff -u src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.21 src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.22
--- src/crypto/external/bsd/openssl/dist/apps/s_client.c:1.21 Sat Mar 21 20:53:02 2020
+++ src/crypto/external/bsd/openssl/dist/apps/s_client.c Sun Mar 22 15:56:07 2020
@@ -2804,7 +2804,7 @@ int s_client_main(int argc, char **argv)
* set the flag so we exit.
*/
if (read_tty && !at_eof)
- openssl_fdset(fileno_stdin(), &readfds);
+ openssl_fdset(fdin, &readfds);
#if !defined(OPENSSL_SYS_VMS)
if (write_tty)
openssl_fdset(fdout, &writefds);
Index: src/crypto/external/bsd/openssl/dist/apps/s_server.c
diff -u src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.20 src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.21
--- src/crypto/external/bsd/openssl/dist/apps/s_server.c:1.20 Sat Mar 21 20:53:02 2020
+++ src/crypto/external/bsd/openssl/dist/apps/s_server.c Sun Mar 22 15:56:07 2020
@@ -2423,7 +2423,7 @@ static int sv_body(int s, int stype, int
}
FD_ZERO(&readfds);
#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS)
- openssl_fdset(fileno_stdin(), &readfds);
+ openssl_fdset(fdin, &readfds);
#endif
openssl_fdset(s, &readfds);
/*
