From: Simon Tatham <anakin@pobox.com>
Date: Tue, 1 Sep 2015 17:45:51 +0000 (+0100)
Subject: pterm: move termios setup to after the fork.
X-Git-Tag: 0.68~391
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=097d5ffb37c0280529eb6b172c9ce43f335cf73c;p=PuTTY.git

pterm: move termios setup to after the fork.

On OS X, apparently, we can't do termios setup on the pty master, so
instead we have to leave it until we've opened the slave fd in the
child process. That works on Linux too, so let's leave it here rather
than having another cumbersome ifdef.
---

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 8c468887..0b7c6309 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -763,33 +763,6 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
     if (pty->master_fd < 0)
 	pty_open_master(pty);
 
-    /*
-     * Set up configuration-dependent termios settings on the new pty.
-     */
-    {
-	struct termios attrs;
-	tcgetattr(pty->master_fd, &attrs);
-
-        /*
-         * Set the backspace character to be whichever of ^H and ^? is
-         * specified by bksp_is_delete.
-         */
-	attrs.c_cc[VERASE] = conf_get_int(conf, CONF_bksp_is_delete)
-	    ? '\177' : '\010';
-
-        /*
-         * Set the IUTF8 bit iff the character set is UTF-8.
-         */
-#ifdef IUTF8
-        if (frontend_is_utf8(frontend))
-            attrs.c_iflag |= IUTF8;
-        else
-            attrs.c_iflag &= ~IUTF8;
-#endif
-
-	tcsetattr(pty->master_fd, TCSANOW, &attrs);
-    }
-
 #ifndef OMIT_UTMP
     /*
      * Stamp utmp (that is, tell the utmp helper process to do so),
@@ -830,6 +803,8 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
     }
 
     if (pid == 0) {
+        struct termios attrs;
+
 	/*
 	 * We are the child.
 	 */
@@ -852,6 +827,34 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
 #endif
 	pgrp = getpid();
 	tcsetpgrp(0, pgrp);
+
+        /*
+         * Set up configuration-dependent termios settings on the new
+         * pty. Linux would have let us do this on the pty master
+         * before we forked, but that fails on OS X, so we do it here
+         * instead.
+         */
+	if (tcgetattr(0, &attrs) == 0) {
+            /*
+             * Set the backspace character to be whichever of ^H and
+             * ^? is specified by bksp_is_delete.
+             */
+            attrs.c_cc[VERASE] = conf_get_int(conf, CONF_bksp_is_delete)
+                ? '\177' : '\010';
+
+            /*
+             * Set the IUTF8 bit iff the character set is UTF-8.
+             */
+#ifdef IUTF8
+            if (frontend_is_utf8(frontend))
+                attrs.c_iflag |= IUTF8;
+            else
+                attrs.c_iflag &= ~IUTF8;
+#endif
+
+            tcsetattr(0, TCSANOW, &attrs);
+        }
+
 	setpgid(pgrp, pgrp);
         {
             int ptyfd = open(pty->name, O_WRONLY, 0);