X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/3a7c6b9e4145c1f8e123620bd2ee136a89d4f023..d47accad0f250d5d59079001443df42fb04d67f2:/unix/uxpty.c?ds=sidebyside diff --git a/unix/uxpty.c b/unix/uxpty.c index 708e82d6..ca7e98ad 100644 --- a/unix/uxpty.c +++ b/unix/uxpty.c @@ -360,8 +360,10 @@ static void pty_open_master(Pty pty) /* * Set the pty master into non-blocking mode. */ - int i = 1; - ioctl(pty->master_fd, FIONBIO, &i); + int fl; + fl = fcntl(pty->master_fd, F_GETFL); + if (fl != -1 && !(fl & O_NONBLOCK)) + fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK); } if (!ptys_by_fd) @@ -1085,5 +1087,7 @@ Backend pty_backend = { pty_provide_logctx, pty_unthrottle, pty_cfg_info, - 1 + "pty", + -1, + 0 };