tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Remove leave_non_blocking() which is now dead code 

because nothing sets in_non_blocking_mode any more. Patch from
michaael.meeks at collabora.com, ok djm@

OpenBSD-Commit-ID: c403cefe97a5a99eca816e19cc849cdf926bd09c
This commit is contained in:
dtucker@openbsd.org 2020-04-24 02:19:40 +00:00 committed by Darren Tucker
parent 8654e35617
commit 3beb7276e7
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.343 2020/04/03 02:40:32 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.344 2020/04/24 02:19:40 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -149,9 +149,6 @@ extern char *forward_agent_sock_path;
static volatile sig_atomic_t received_window_change_signal = 0; static volatile sig_atomic_t received_window_change_signal = 0;
static volatile sig_atomic_t received_signal = 0; static volatile sig_atomic_t received_signal = 0;
/* Flag indicating whether the user's terminal is in non-blocking mode. */
static int in_non_blocking_mode = 0;
/* Time when backgrounded control master using ControlPersist should exit */ /* Time when backgrounded control master using ControlPersist should exit */
static time_t control_persist_exit_time = 0; static time_t control_persist_exit_time = 0;
@ -196,17 +193,6 @@ static struct global_confirms global_confirms =
void ssh_process_session2_setup(int, int, int, struct sshbuf *); void ssh_process_session2_setup(int, int, int, struct sshbuf *);
/* Restores stdin to blocking mode. */
static void
leave_non_blocking(void)
{
if (in_non_blocking_mode) {
unset_nonblock(fileno(stdin));
in_non_blocking_mode = 0;
}
}
/* /*
* Signal handler for the window change signal (SIGWINCH). This just sets a * Signal handler for the window change signal (SIGWINCH). This just sets a
* flag indicating that the window has changed. * flag indicating that the window has changed.
@ -2458,7 +2444,6 @@ void
cleanup_exit(int i) cleanup_exit(int i)
{ {
leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
leave_non_blocking();
if (options.control_path != NULL && muxserver_sock != -1) if (options.control_path != NULL && muxserver_sock != -1)
unlink(options.control_path); unlink(options.control_path);
ssh_kill_proxy_command(); ssh_kill_proxy_command();