merge 5.4p1

1 files changed, 13 insertions, 10 deletions

diff --git a/sshtty.c b/sshtty.c
index 21ade4e51..d214ce3bb 100644
--- a/sshtty.c
+++ b/sshtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshtty.c,v 1.13 2008/05/19 15:45:07 djm Exp $ */
+/* $OpenBSD: sshtty.c,v 1.14 2010/01/09 05:04:24 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,23 +54,25 @@ get_saved_tio(void)
 }
 
 void
-leave_raw_mode(void)
+leave_raw_mode(int quiet)
 {
         if (!_in_raw_mode)
                 return;
-        if (tcsetattr(fileno(stdin), TCSADRAIN, &_saved_tio) == -1)
-                perror("tcsetattr");
-        else
+        if (tcsetattr(fileno(stdin), TCSADRAIN, &_saved_tio) == -1) {
+                if (!quiet)
+                        perror("tcsetattr");
+        } else
                 _in_raw_mode = 0;
 }
 
 void
-enter_raw_mode(void)
+enter_raw_mode(int quiet)
 {
         struct termios tio;
 
         if (tcgetattr(fileno(stdin), &tio) == -1) {
-                perror("tcgetattr");
+                if (!quiet)
+                        perror("tcgetattr");
                 return;
         }
         _saved_tio = tio;
@@ -86,8 +88,9 @@ enter_raw_mode(void)
         tio.c_oflag &= ~OPOST;
         tio.c_cc[VMIN] = 1;
         tio.c_cc[VTIME] = 0;
-        if (tcsetattr(fileno(stdin), TCSADRAIN, &tio) == -1)
-                perror("tcsetattr");
-        else
+        if (tcsetattr(fileno(stdin), TCSADRAIN, &tio) == -1) {
+                if (!quiet)
+                        perror("tcsetattr");
+        } else
                 _in_raw_mode = 1;
 }