[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  8a4460c240cfe111de8bfee7995da76e1f0459fc (commit)
      from  26810b5eaffad3fa6d320600d8ea36e2ed86ff7c (commit)


- Log -----------------------------------------------------------------
commit 8a4460c240cfe111de8bfee7995da76e1f0459fc
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Aug 31 22:48:03 2017 +0200

    config: get "stty technique" working again on MacOS X.
    
    Addresses GH#2167.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4311)

-----------------------------------------------------------------------

Summary of changes:
 config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config b/config
index c8886de..609ed2f 100755
--- a/config
+++ b/config
@@ -502,9 +502,7 @@ case "$GUESSOS" in
 	    echo "         invoke 'KERNEL_BITS=64 $THERE/config $options'."
 	    if [ "$DRYRUN" = "false" -a -t 1 ]; then
 	      echo "         You have about 5 seconds to press Ctrl-C to abort."
-	      # The stty technique used elsewhere doesn't work on
-	      # MacOS. At least, right now on this Mac.
-	      sleep 5
+	      (trap "stty `stty -g`; exit 1" 2; stty -icanon min 0 time 50; read waste; exit 0) <&1 || exit
 	    fi
 	fi
 	if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then