diff options
author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /sshtty.c | |
parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'sshtty.c')
-rw-r--r-- | sshtty.c | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: sshtty.c,v 1.4 2003/07/16 10:36:28 markus Exp $"); | 38 | RCSID("$OpenBSD: sshtty.c,v 1.5 2003/09/19 17:43:35 markus Exp $"); |
39 | 39 | ||
40 | #include "sshtty.h" | 40 | #include "sshtty.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -43,12 +43,6 @@ RCSID("$OpenBSD: sshtty.c,v 1.4 2003/07/16 10:36:28 markus Exp $"); | |||
43 | static struct termios _saved_tio; | 43 | static struct termios _saved_tio; |
44 | static int _in_raw_mode = 0; | 44 | static int _in_raw_mode = 0; |
45 | 45 | ||
46 | int | ||
47 | in_raw_mode(void) | ||
48 | { | ||
49 | return _in_raw_mode; | ||
50 | } | ||
51 | |||
52 | struct termios | 46 | struct termios |
53 | get_saved_tio(void) | 47 | get_saved_tio(void) |
54 | { | 48 | { |
@@ -64,8 +58,6 @@ leave_raw_mode(void) | |||
64 | perror("tcsetattr"); | 58 | perror("tcsetattr"); |
65 | else | 59 | else |
66 | _in_raw_mode = 0; | 60 | _in_raw_mode = 0; |
67 | |||
68 | fatal_remove_cleanup((void (*) (void *)) leave_raw_mode, NULL); | ||
69 | } | 61 | } |
70 | 62 | ||
71 | void | 63 | void |
@@ -94,6 +86,4 @@ enter_raw_mode(void) | |||
94 | perror("tcsetattr"); | 86 | perror("tcsetattr"); |
95 | else | 87 | else |
96 | _in_raw_mode = 1; | 88 | _in_raw_mode = 1; |
97 | |||
98 | fatal_add_cleanup((void (*) (void *)) leave_raw_mode, NULL); | ||
99 | } | 89 | } |