X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6b0eeb4e4c9ecbff8eda72c5a1b49a448d6bbf3a..d9dcb3dec77bf18a282636122254e6a368de258e:/unix/pty.c

diff --git a/unix/pty.c b/unix/pty.c
index 5d856930..61b9d03a 100644
--- a/unix/pty.c
+++ b/unix/pty.c
@@ -97,6 +97,7 @@ static void setup_utmp(char *ttyname, char *location)
 #endif
     struct passwd *pw;
     FILE *wtmp;
+    time_t uttime;
 
     pw = getpwuid(getuid());
     memset(&utmp_entry, 0, sizeof(utmp_entry));
@@ -106,7 +107,10 @@ static void setup_utmp(char *ttyname, char *location)
     strncpy(utmp_entry.ut_id, ttyname+8, lenof(utmp_entry.ut_id));
     strncpy(utmp_entry.ut_user, pw->pw_name, lenof(utmp_entry.ut_user));
     strncpy(utmp_entry.ut_host, location, lenof(utmp_entry.ut_host));
-    time(&utmp_entry.ut_time);
+    /* Apparently there are some architectures where (struct utmp).ut_time
+     * is not essentially time_t (e.g. Linux amd64). Hence the temporary. */
+    time(&uttime);
+    utmp_entry.ut_time = uttime; /* may truncate */
 
 #if defined HAVE_PUTUTLINE
     utmpname(UTMP_FILE);
@@ -141,13 +145,15 @@ static void cleanup_utmp(void)
 {
 #ifndef OMIT_UTMP
     FILE *wtmp;
+    time_t uttime;
 
     if (!pty_stamped_utmp)
 	return;
 
     utmp_entry.ut_type = DEAD_PROCESS;
     memset(utmp_entry.ut_user, 0, lenof(utmp_entry.ut_user));
-    time(&utmp_entry.ut_time);
+    time(&uttime);
+    utmp_entry.ut_time = uttime;
 
     if ((wtmp = fopen(WTMP_FILE, "a")) != NULL) {
 	fwrite(&utmp_entry, 1, sizeof(utmp_entry), wtmp);
@@ -485,8 +491,9 @@ 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 keepalive)
 {
     int slavefd;
     pid_t pid, pgrp;
@@ -517,9 +524,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 +535,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;
@@ -581,6 +590,29 @@ static char *pty_init(void *frontend, void **backend_handle, Config *cfg,
 	    sprintf(windowid_env_var, "WINDOWID=%ld", windowid);
 	    putenv(windowid_env_var);
 	}
+	{
+	    char *e = cfg->environmt;
+	    char *var, *varend, *val, *varval;
+	    while (*e) {
+		var = e;
+		while (*e && *e != '\t') e++;
+		varend = e;
+		if (*e == '\t') e++;
+		val = e;
+		while (*e) e++;
+		e++;
+
+		varval = dupprintf("%.*s=%s", varend-var, var, val);
+		putenv(varval);
+		/*
+		 * We must not free varval, since putenv links it
+		 * into the environment _in place_. Weird, but
+		 * there we go. Memory usage will be rationalised
+		 * as soon as we exec anyway.
+		 */
+	    }
+	}
+
 	/*
 	 * SIGINT and SIGQUIT may have been set to ignored by our
 	 * parent, particularly by things like sh -c 'pterm &' and
@@ -666,7 +698,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;
+    }
 }
 
 /*