diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/clientloop.c b/clientloop.c index 8950f444b..da396c72a 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.343 2020/04/03 02:40:32 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.344 2020/04/24 02:19:40 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -149,9 +149,6 @@ extern char *forward_agent_sock_path; | |||
149 | static volatile sig_atomic_t received_window_change_signal = 0; | 149 | static volatile sig_atomic_t received_window_change_signal = 0; |
150 | static volatile sig_atomic_t received_signal = 0; | 150 | static volatile sig_atomic_t received_signal = 0; |
151 | 151 | ||
152 | /* Flag indicating whether the user's terminal is in non-blocking mode. */ | ||
153 | static int in_non_blocking_mode = 0; | ||
154 | |||
155 | /* Time when backgrounded control master using ControlPersist should exit */ | 152 | /* Time when backgrounded control master using ControlPersist should exit */ |
156 | static time_t control_persist_exit_time = 0; | 153 | static time_t control_persist_exit_time = 0; |
157 | 154 | ||
@@ -196,17 +193,6 @@ static struct global_confirms global_confirms = | |||
196 | 193 | ||
197 | void ssh_process_session2_setup(int, int, int, struct sshbuf *); | 194 | void ssh_process_session2_setup(int, int, int, struct sshbuf *); |
198 | 195 | ||
199 | /* Restores stdin to blocking mode. */ | ||
200 | |||
201 | static void | ||
202 | leave_non_blocking(void) | ||
203 | { | ||
204 | if (in_non_blocking_mode) { | ||
205 | unset_nonblock(fileno(stdin)); | ||
206 | in_non_blocking_mode = 0; | ||
207 | } | ||
208 | } | ||
209 | |||
210 | /* | 196 | /* |
211 | * Signal handler for the window change signal (SIGWINCH). This just sets a | 197 | * Signal handler for the window change signal (SIGWINCH). This just sets a |
212 | * flag indicating that the window has changed. | 198 | * flag indicating that the window has changed. |
@@ -2458,7 +2444,6 @@ void | |||
2458 | cleanup_exit(int i) | 2444 | cleanup_exit(int i) |
2459 | { | 2445 | { |
2460 | leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); | 2446 | leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); |
2461 | leave_non_blocking(); | ||
2462 | if (options.control_path != NULL && muxserver_sock != -1) | 2447 | if (options.control_path != NULL && muxserver_sock != -1) |
2463 | unlink(options.control_path); | 2448 | unlink(options.control_path); |
2464 | ssh_kill_proxy_command(); | 2449 | ssh_kill_proxy_command(); |