Allow detection of input EOF in quiet mode by adding -no_ign_eof option

to s_client application.
PR: #1761
Submitted by: David Woodhouse <dwmw2@infradead.org>

diff --git a/apps/s_client.c b/apps/s_client.c
index 8922cdcf6189e4540a8dd8b03cbe40cfcab36157..759e90218e70e3a613709a0cc7663b4e8a76ab91 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -221,6 +221,7 @@ static void sc_usage(void)
        BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
        BIO_printf(bio_err," -quiet        - no s_client output\n");
        BIO_printf(bio_err," -ign_eof      - ignore input eof (default when -quiet)\n");
+       BIO_printf(bio_err," -no_ign_eof   - don't ignore input eof\n");
        BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
        BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
        BIO_printf(bio_err," -tls1         - just use TLSv1\n");
@@ -437,6 +438,8 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-ign_eof") == 0)
                        c_ign_eof=1;
+               else if (strcmp(*argv,"-no_ign_eof") == 0)
+                       c_ign_eof=0;
                else if (strcmp(*argv,"-pause") == 0)
                        c_Pause=1;
                else if (strcmp(*argv,"-debug") == 0)