X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxplink.c;h=77c46a4d8ab870fb2f0026e100f1014d80b66adb;hb=a3f74661c8da1b8ac2eb34b0e73fb70172a85b48;hp=37c8533e453924c2903b523dc64bbb9594f87227;hpb=62cbc7dc0b33808dc8794c59f60971fbba97894b;p=PuTTY.git

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 37c8533e..77c46a4d 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -585,6 +585,8 @@ static void version(void)
     exit(1);
 }
 
+void frontend_net_error_pending(void) {}
+
 int main(int argc, char **argv)
 {
     int sending;
@@ -885,6 +887,12 @@ int main(int argc, char **argv)
     if (portnumber != -1)
 	conf_set_int(conf, CONF_port, portnumber);
 
+    /*
+     * Block SIGPIPE, so that we'll get EPIPE individually on
+     * particular network connections that go wrong.
+     */
+    putty_signal(SIGPIPE, SIG_IGN);
+
     /*
      * Set up the pipe we'll use to tell us about SIGWINCH.
      */
@@ -1019,27 +1027,8 @@ int main(int argc, char **argv)
 	    ret = select(maxfd, &rset, &wset, &xset, ptv);
 	    if (ret == 0)
 		now = next;
-	    else {
-		long newnow = GETTICKCOUNT();
-		/*
-		 * Check to see whether the system clock has
-		 * changed massively during the select.
-		 */
-		if (newnow - now < 0 || newnow - now > next - now) {
-		    /*
-		     * If so, look at the elapsed time in the
-		     * select and use it to compute a new
-		     * tickcount_offset.
-		     */
-		    long othernow = now + tv.tv_sec * 1000 + tv.tv_usec / 1000;
-		    /* So we'd like GETTICKCOUNT to have returned othernow,
-		     * but instead it return newnow. Hence ... */
-		    tickcount_offset += othernow - newnow;
-		    now = othernow;
-		} else {
-		    now = newnow;
-		}
-	    }
+	    else
+		now = GETTICKCOUNT();
 	} while (ret < 0 && errno == EINTR);
 
 	if (ret < 0) {
@@ -1101,6 +1090,8 @@ int main(int argc, char **argv)
 	    back->unthrottle(backhandle, try_output(TRUE));
 	}
 
+        net_pending_errors();
+
 	if ((!connopen || !back->connected(backhandle)) &&
 	    bufchain_size(&stdout_data) == 0 &&
 	    bufchain_size(&stderr_data) == 0)