X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxplink.c;h=6f17b5a2d33c0f03443bab46aaccf94d8ec4a27b;hb=49204fe4107d8af3167fc940238f48113173fd92;hp=146fcb30133d7b7b872fc2c417972cf723b8ec5e;hpb=98028c746f08d0e7bf5d8524d6aca85e5a2f4145;p=PuTTY.git

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 146fcb30..6f17b5a2 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -230,6 +230,7 @@ static void usage(void)
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
+    printf("  -N        don't start a shell/command (SSH-2 only)\n");
     exit(1);
 }
 
@@ -251,6 +252,7 @@ int main(int argc, char **argv)
     int errors;
     int use_subsystem = 0;
     void *ldisc, *logctx;
+    long now;
 
     ssh_get_line = console_get_line;
 
@@ -583,6 +585,7 @@ int main(int argc, char **argv)
     atexit(cleanup_termios);
     ldisc_update(NULL, 1, 1);
     sending = FALSE;
+    now = GETTICKCOUNT();
 
     while (1) {
 	fd_set rset, wset, xset;
@@ -643,7 +646,23 @@ int main(int argc, char **argv)
 	}
 
 	do {
-	    ret = select(maxfd, &rset, &wset, &xset, NULL);
+	    long next, ticks;
+	    struct timeval tv, *ptv;
+
+	    if (run_timers(now, &next)) {
+		ticks = next - GETTICKCOUNT();
+		if (ticks < 0) ticks = 0;   /* just in case */
+		tv.tv_sec = ticks / 1000;
+		tv.tv_usec = ticks % 1000 * 1000;
+		ptv = &tv;
+	    } else {
+		ptv = NULL;
+	    }
+	    ret = select(maxfd, &rset, &wset, &xset, ptv);
+	    if (ret == 0)
+		now = next;
+	    else
+		now = GETTICKCOUNT();
 	} while (ret < 0 && errno == EINTR);
 
 	if (ret < 0) {