- dtucker@cvs.openbsd.org 2010/01/12 01:31:05

[openssh.git] / sshtty.c

diff --git a/sshtty.c b/sshtty.c
index eed8cfdc21badbb45368b495cb0e90f1b187a11f..d214ce3bb1a2e0a1f6cc36891b8a0518177dbf87 100644 (file)
--- a/sshtty.c
+++ b/sshtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshtty.c,v 1.2 2001/12/19 07:18:56 deraadt 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
@@ -37,49 +37,50 @@
 
 #include "includes.h"
 
-#include "sshtty.h"
-#include "log.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <termios.h>
+#include <pwd.h>
+
+#include "sshpty.h"
 
 static struct termios _saved_tio;
 static int _in_raw_mode = 0;
 
-int
-in_raw_mode(void)
-{
-       return _in_raw_mode;
-}
-
-struct termios
+struct termios *
 get_saved_tio(void)
 {
-       return _saved_tio;
+       return _in_raw_mode ? &_saved_tio : NULL;
 }
 
 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;
-
-       fatal_remove_cleanup((void (*) (void *)) leave_raw_mode, NULL);
 }
 
 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;
        tio.c_iflag |= IGNPAR;
        tio.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+#ifdef IUCLC
+       tio.c_iflag &= ~IUCLC;
+#endif
        tio.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
 #ifdef IEXTEN
        tio.c_lflag &= ~IEXTEN;
@@ -87,10 +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;
-
-       fatal_add_cleanup((void (*) (void *)) leave_raw_mode, NULL);
 }