Add support in uxnet.c for Unix-domain listening sockets.

[PuTTY.git] / windows / winplink.c

diff --git a/windows/winplink.c b/windows/winplink.c
index 7ec98e7fd5bf9e75572d081c7fdada8946d1201a..5849e0d4a1b8e0caa20cd287949b2af92aafdf9c 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -49,6 +49,15 @@ void modalfatalbox(char *p, ...)
     }
     cleanup_exit(1);
 }
+void nonfatal(char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "ERROR: ");
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+}
 void connection_fatal(void *frontend, char *p, ...)
 {
     va_list ap;
@@ -343,8 +352,10 @@ int main(int argc, char **argv)
            } else if (!strcmp(p, "-s")) {
                /* Save status to write to conf later. */
                use_subsystem = 1;
-           } else if (!strcmp(p, "-V")) {
+           } else if (!strcmp(p, "-V") || !strcmp(p, "--version")) {
                 version();
+           } else if (!strcmp(p, "--help")) {
+                usage();
             } else if (!strcmp(p, "-pgpfp")) {
                 pgp_fingerprints();
                 exit(1);
@@ -633,13 +644,15 @@ int main(int argc, char **argv)
            sending = TRUE;
        }
 
-       if (run_timers(now, &next)) {
-       then = now;
-       now = GETTICKCOUNT();
-       if (now - then > next - then)
-           ticks = 0;
-       else
-           ticks = next - now;
+        if (toplevel_callback_pending()) {
+            ticks = 0;
+        } else if (run_timers(now, &next)) {
+           then = now;
+           now = GETTICKCOUNT();
+           if (now - then > next - then)
+               ticks = 0;
+           else
+               ticks = next - now;
        } else {
            ticks = INFINITE;
        }
@@ -723,6 +736,8 @@ int main(int argc, char **argv)
            }
        }
 
+        run_toplevel_callbacks();
+
        if (n == WAIT_TIMEOUT) {
            now = next;
        } else {