X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/30d1257c0dadb88f1c3a8c18f11403490ae0dd80..89e97516fedf1d0a7fe9c569bb569fa7ea872afa:/unix/uxpty.c?ds=sidebyside

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 96489e1a..e47f7981 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
+#include <assert.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <grp.h>
@@ -83,6 +84,7 @@ struct pty_tag {
     int term_width, term_height;
     int child_dead, finished;
     int exit_code;
+    bufchain output_data;
 };
 
 /*
@@ -178,6 +180,7 @@ static struct utmpx utmp_entry;
 char **pty_argv;
 
 static void pty_close(Pty pty);
+static void pty_try_write(Pty pty);
 
 #ifndef OMIT_UTMP
 static void setup_utmp(char *ttyname, char *location)
@@ -272,8 +275,10 @@ static void fatal_sig_handler(int signum)
 
 static int pty_open_slave(Pty pty)
 {
-    if (pty->slave_fd < 0)
+    if (pty->slave_fd < 0) {
 	pty->slave_fd = open(pty->name, O_RDWR);
+        fcntl(pty->slave_fd, F_SETFD, FD_CLOEXEC);
+    }
 
     return pty->slave_fd;
 }
@@ -304,6 +309,8 @@ static void pty_open_master(Pty pty)
 		    strcpy(pty->name, master_name);
 		    pty->name[5] = 't'; /* /dev/ptyXX -> /dev/ttyXX */
 
+                    fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC);
+
 		    if (pty_open_slave(pty) >= 0 &&
 			access(pty->name, R_OK | W_OK) == 0)
 			goto got_one;
@@ -343,10 +350,20 @@ static void pty_open_master(Pty pty)
 	exit(1);
     }
 
+    fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC);
+
     pty->name[FILENAME_MAX-1] = '\0';
     strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
 #endif
 
+    {
+        /*
+         * Set the pty master into non-blocking mode.
+         */
+        int i = 1;
+        ioctl(pty->master_fd, FIONBIO, &i);
+    }
+
     if (!ptys_by_fd)
 	ptys_by_fd = newtree234(pty_compare_by_fd);
     add234(ptys_by_fd, pty);
@@ -375,6 +392,7 @@ void pty_pre_init(void)
 #endif
 
     pty = single_pty = snew(struct pty_tag);
+    bufchain_init(&pty->output_data);
 
     /* set the child signal handler straight away; it needs to be set
      * before we ever fork. */
@@ -555,7 +573,12 @@ int pty_real_select_result(Pty pty, int event, int status)
 	    } else if (ret > 0) {
 		from_backend(pty->frontend, 0, buf, ret);
 	    }
-	}
+	} else if (event == 2) {
+            /*
+             * Attempt to send data down the pty.
+             */
+            pty_try_write(pty);
+        }
     }
 
     if (finished && !pty->finished) {
@@ -629,7 +652,12 @@ int pty_select_result(int fd, int event)
 
 static void pty_uxsel_setup(Pty pty)
 {
-    uxsel_set(pty->master_fd, 1, pty_select_result);
+    int rwx;
+
+    rwx = 1;                           /* always want to read from pty */
+    if (bufchain_size(&pty->output_data))
+        rwx |= 2;                      /* might also want to write to it */
+    uxsel_set(pty->master_fd, rwx, pty_select_result);
 
     /*
      * In principle this only needs calling once for all pty
@@ -744,7 +772,9 @@ static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
 	dup2(slavefd, 1);
 	dup2(slavefd, 2);
 	setsid();
+#ifdef TIOCSCTTY
 	ioctl(slavefd, TIOCSCTTY, 1);
+#endif
 	pgrp = getpid();
 	tcsetpgrp(slavefd, pgrp);
 	setpgid(pgrp, pgrp);
@@ -841,6 +871,8 @@ static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
 
     *backend_handle = pty;
 
+    *realhost = dupprintf("\0");
+
     return NULL;
 }
 
@@ -869,6 +901,33 @@ static void pty_free(void *handle)
     sfree(pty);
 }
 
+static void pty_try_write(Pty pty)
+{
+    void *data;
+    int len, ret;
+
+    assert(pty->master_fd >= 0);
+
+    while (bufchain_size(&pty->output_data) > 0) {
+        bufchain_prefix(&pty->output_data, &data, &len);
+	ret = write(pty->master_fd, data, len);
+
+        if (ret < 0 && (errno == EWOULDBLOCK)) {
+            /*
+             * We've sent all we can for the moment.
+             */
+            break;
+        }
+	if (ret < 0) {
+	    perror("write pty master");
+	    exit(1);
+	}
+	bufchain_consume(&pty->output_data, ret);
+    }
+
+    pty_uxsel_setup(pty);
+}
+
 /*
  * Called to send data down the pty.
  */
@@ -877,18 +936,12 @@ static int pty_send(void *handle, char *buf, int len)
     Pty pty = (Pty)handle;
 
     if (pty->master_fd < 0)
-	return 0;		       /* ignore all writes if fd closed */
+	return 0;                      /* ignore all writes if fd closed */
 
-    while (len > 0) {
-	int ret = write(pty->master_fd, buf, len);
-	if (ret < 0) {
-	    perror("write pty master");
-	    exit(1);
-	}
-	buf += ret;
-	len -= ret;
-    }
-    return 0;
+    bufchain_add(&pty->output_data, buf, len);
+    pty_try_write(pty);
+
+    return bufchain_size(&pty->output_data);
 }
 
 static void pty_close(Pty pty)
@@ -961,10 +1014,10 @@ static const struct telnet_special *pty_get_specials(void *handle)
     return NULL;
 }
 
-static Socket pty_socket(void *handle)
+static int pty_connected(void *handle)
 {
     /* Pty pty = (Pty)handle; */
-    return NULL;		       /* shouldn't ever be needed */
+    return TRUE;
 }
 
 static int pty_sendok(void *handle)
@@ -1021,7 +1074,7 @@ Backend pty_backend = {
     pty_size,
     pty_special,
     pty_get_specials,
-    pty_socket,
+    pty_connected,
     pty_exitcode,
     pty_sendok,
     pty_ldisc,