Compile fix for GTK 3.18: avoid gtk_adjustment_changed().

[PuTTY.git] / unix / uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index ad122e9da4b3959f65a71f3824de1e7f3c86eb77..3d3a645fbbebae48dfdb339362f185a1314a7f84 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -25,7 +25,7 @@
 
 #define MAX_STDIN_BACKLOG 4096
 
-void *logctx;
+static void *logctx;
 
 static struct termios orig_termios;
 
@@ -581,6 +581,11 @@ static void usage(void)
     printf("  -N        don't start a shell/command (SSH-2 only)\n");
     printf("  -nc host:port\n");
     printf("            open tunnel in place of session (SSH-2 only)\n");
+    printf("  -sshlog file\n");
+    printf("  -sshrawlog file\n");
+    printf("            log protocol details to a file\n");
+    printf("  -shareexists\n");
+    printf("            test whether a connection-sharing upstream exists\n");
     exit(1);
 }
 
@@ -688,6 +693,10 @@ int main(int argc, char **argv)
                }
            } else if (!strcmp(p, "-shareexists")) {
                 just_test_share_exists = TRUE;
+           } else if (!strcmp(p, "-fuzznet")) {
+               conf_set_int(conf, CONF_proxy_type, PROXY_FUZZ);
+               conf_set_str(conf, CONF_proxy_telnet_command,
+                            "%host");
            } else {
                fprintf(stderr, "plink: unknown option \"%s\"\n", p);
                errors = 1;
@@ -986,6 +995,11 @@ int main(int argc, char **argv)
        /* nodelay is only useful if stdin is a terminal device */
        int nodelay = conf_get_int(conf, CONF_tcp_nodelay) && isatty(0);
 
+       /* This is a good place for a fuzzer to fork us. */
+#ifdef __AFL_HAVE_MANUAL_CONTROL
+       __AFL_INIT();
+#endif
+
        error = back->init(NULL, &backhandle, conf,
                           conf_get_str(conf, CONF_host),
                           conf_get_int(conf, CONF_port),