X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/125105d16c788398562ac03e91ce7a0dc0292492..6e7a48828dc13d077e278df1c0598f6bfa66ef0b:/unix/pty.c

diff --git a/unix/pty.c b/unix/pty.c
index dac67364..7f46f1aa 100644
--- a/unix/pty.c
+++ b/unix/pty.c
@@ -485,8 +485,8 @@ static void pty_uxsel_setup(void)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *pty_init(void *frontend, void **backend_handle, Config *cfg,
-		      char *host, int port, char **realhost, int nodelay)
+static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
+			    char *host, int port, char **realhost, int nodelay)
 {
     int slavefd;
     pid_t pid, pgrp;
@@ -517,9 +517,10 @@ static char *pty_init(void *frontend, void **backend_handle, Config *cfg,
      * Stamp utmp (that is, tell the utmp helper process to do so),
      * or not.
      */
-    if (!cfg->stamp_utmp)
+    if (!cfg->stamp_utmp) {
 	close(pty_utmp_helper_pipe);   /* just let the child process die */
-    else {
+	pty_utmp_helper_pipe = -1;
+    } else {
 	char *location = get_x_display(pty_frontend);
 	int len = strlen(location)+1, pos = 0;   /* +1 to include NUL */
 	while (pos < len) {
@@ -527,6 +528,7 @@ static char *pty_init(void *frontend, void **backend_handle, Config *cfg,
 	    if (ret < 0) {
 		perror("pterm: writing to utmp helper process");
 		close(pty_utmp_helper_pipe);   /* arrgh, just give up */
+		pty_utmp_helper_pipe = -1;
 		break;
 	    }
 	    pos += ret;
@@ -623,21 +625,23 @@ static char *pty_init(void *frontend, void **backend_handle, Config *cfg,
     return NULL;
 }
 
-/*
- * Stub routine (we don't have any need to reconfigure this backend).
- */
 static void pty_reconfig(void *handle, Config *cfg)
 {
+    /*
+     * We don't have much need to reconfigure this backend, but
+     * unfortunately we do need to pick up the setting of Close On
+     * Exit so we know whether to give a `terminated' message.
+     */
+    pty_cfg = *cfg;		       /* structure copy */
 }
 
 /*
- * Stub routine (never called in pterm
+ * Stub routine (never called in pterm).
  */
 static void pty_free(void *handle)
 {
 }
 
-
 /*
  * Called to send data down the pty.
  */
@@ -664,7 +668,10 @@ static void pty_close(void)
 	close(pty_master_fd);
 	pty_master_fd = -1;
     }
-    close(pty_utmp_helper_pipe);       /* this causes utmp to be cleaned up */
+    if (pty_utmp_helper_pipe >= 0) {
+	close(pty_utmp_helper_pipe);   /* this causes utmp to be cleaned up */
+	pty_utmp_helper_pipe = -1;
+    }
 }
 
 /*