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: make sure stdout is non-blocking; ok djm@ 

OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d
This commit is contained in:
markus@openbsd.org 2022-05-04 07:31:22 +00:00 committed by Damien Miller
parent e5c036d209
commit f4e67c0ad2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.417 2022/04/20 04:19:11 djm Exp $ */ /* $OpenBSD: channels.c,v 1.418 2022/05/04 07:31:22 markus 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
@ -304,6 +304,8 @@ static void
channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd, channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd,
int extusage, int nonblock, int is_tty) int extusage, int nonblock, int is_tty)
{ {
int val;
if (rfd != -1) if (rfd != -1)
fcntl(rfd, F_SETFD, FD_CLOEXEC); fcntl(rfd, F_SETFD, FD_CLOEXEC);
if (wfd != -1 && wfd != rfd) if (wfd != -1 && wfd != rfd)
@ -333,15 +335,18 @@ channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd,
* restore their blocking state on exit to avoid interfering * restore their blocking state on exit to avoid interfering
* with other programs that follow. * with other programs that follow.
*/ */
if (rfd != -1 && !isatty(rfd) && fcntl(rfd, F_GETFL) == 0) { if (rfd != -1 && !isatty(rfd) &&
(val = fcntl(rfd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) {
c->restore_block |= CHANNEL_RESTORE_RFD; c->restore_block |= CHANNEL_RESTORE_RFD;
set_nonblock(rfd); set_nonblock(rfd);
} }
if (wfd != -1 && !isatty(wfd) && fcntl(wfd, F_GETFL) == 0) { if (wfd != -1 && !isatty(wfd) &&
(val = fcntl(wfd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) {
c->restore_block |= CHANNEL_RESTORE_WFD; c->restore_block |= CHANNEL_RESTORE_WFD;
set_nonblock(wfd); set_nonblock(wfd);
} }
if (efd != -1 && !isatty(efd) && fcntl(efd, F_GETFL) == 0) { if (efd != -1 && !isatty(efd) &&
(val = fcntl(efd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) {
c->restore_block |= CHANNEL_RESTORE_EFD; c->restore_block |= CHANNEL_RESTORE_EFD;
set_nonblock(efd); set_nonblock(efd);
} }