RT3548: Remove some obsolete platforms

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 1a30ef224136e04b07c458675b3d5df31a7bae30..30ea74388b996be5624a23f4e989ea8ca4d403be 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -174,10 +174,6 @@ typedef unsigned int u_int;
 #undef FIONBIO
 #endif
 
-#if defined(OPENSSL_SYS_BEOS_R5)
-#include <fcntl.h>
-#endif
-
 #undef PROG
 #define PROG   s_client_main
 
@@ -629,11 +625,8 @@ int MAIN(int argc, char **argv)
        ENGINE *ssl_client_engine=NULL;
 #endif
        ENGINE *e=NULL;
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
        struct timeval tv;
-#if defined(OPENSSL_SYS_BEOS_R5)
-       int stdin_set = 0;
-#endif
 #endif
 #ifndef OPENSSL_NO_TLSEXT
        char *servername = NULL; 
@@ -1806,7 +1799,7 @@ SSL_set_tlsext_status_ids(con, ids);
 
                if (!ssl_pending)
                        {
-#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
                        if (tty_on)
                                {
                                if (read_tty)  openssl_fdset(fileno(stdin),&readfds);
@@ -1866,25 +1859,6 @@ SSL_set_tlsext_status_ids(con, ids);
                                } else  i=select(width,(void *)&readfds,(void *)&writefds,
                                        NULL,timeoutp);
                        }
-#elif defined(OPENSSL_SYS_BEOS_R5)
-                       /* Under BeOS-R5 the situation is similar to DOS */
-                       i=0;
-                       stdin_set = 0;
-                       (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
-                       if(!write_tty) {
-                               if(read_tty) {
-                                       tv.tv_sec = 1;
-                                       tv.tv_usec = 0;
-                                       i=select(width,(void *)&readfds,(void *)&writefds,
-                                                NULL,&tv);
-                                       if (read(fileno(stdin), sbuf, 0) >= 0)
-                                               stdin_set = 1;
-                                       if (!i && (stdin_set != 1 || !read_tty))
-                                               continue;
-                               } else  i=select(width,(void *)&readfds,(void *)&writefds,
-                                        NULL,timeoutp);
-                       }
-                       (void)fcntl(fileno(stdin), F_SETFL, 0);
 #else
                        i=select(width,(void *)&readfds,(void *)&writefds,
                                 NULL,timeoutp);
@@ -1971,7 +1945,7 @@ SSL_set_tlsext_status_ids(con, ids);
                                goto shut;
                                }
                        }
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
                /* Assume Windows/DOS/BeOS can always write */
                else if (!ssl_pending && write_tty)
 #else
@@ -2066,8 +2040,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 #endif
 #elif defined (OPENSSL_SYS_NETWARE)
                else if (_kbhit())
-#elif defined(OPENSSL_SYS_BEOS_R5)
-               else if (stdin_set)
 #else
                else if (FD_ISSET(fileno(stdin),&readfds))
 #endif