X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxpty.c;h=98f917932b5561856d9ef99f843aa36a6555a38b;hb=1472aa2a265dfbfe7225729862ea21b5fb2da22f;hp=4a606efda87e4f40df787777303c918c5d974fda;hpb=1d21346d4c4fe0610c68c2a2424429978798207d;p=PuTTY.git

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 4a606efd..98f91793 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -373,15 +373,7 @@ static void pty_open_master(Pty pty)
     strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
 #endif
 
-    {
-        /*
-         * Set the pty master into non-blocking mode.
-         */
-        int fl;
-	fl = fcntl(pty->master_fd, F_GETFL);
-	if (fl != -1 && !(fl & O_NONBLOCK))
-	    fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
-    }
+    nonblock(pty->master_fd);
 
     if (!ptys_by_fd)
 	ptys_by_fd = newtree234(pty_compare_by_fd);
@@ -808,7 +800,7 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
 	}
 
 	close(pty->master_fd);
-	fcntl(slavefd, F_SETFD, 0);    /* don't close on exec */
+	noncloexec(slavefd);
 	dup2(slavefd, 0);
 	dup2(slavefd, 1);
 	dup2(slavefd, 2);