Turns out that the compose-keys fix in r9567 did in fact break one

[u/mdw/putty] / unix / uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index b3e5679..77c46a4 100644 (file)
--- 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;
@@ -1025,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) {
@@ -1107,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)