Oops, Ben is quite right about the rather appalling design of

[u/mdw/putty] / plink.c

diff --git a/plink.c b/plink.c
index 7ada2d4..b1bebf9 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -69,6 +69,7 @@ WSAEVENT netevent;
 
 static Backend *back;
 static void *backhandle;
+static Config cfg;
 
 int term_ldisc(Terminal *term, int mode)
 {
@@ -165,7 +166,8 @@ void try_output(int is_stderr)
     }
 }
 
-int from_backend(void *frontend_handle, int is_stderr, char *data, int len)
+int from_backend(void *frontend_handle, int is_stderr,
+                const char *data, int len)
 {
     int osize, esize;
 
@@ -539,14 +541,15 @@ int main(int argc, char **argv)
        int nodelay = cfg.tcp_nodelay &&
            (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
 
-       error = back->init(NULL, &backhandle, cfg.host, cfg.port,
+       error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
                           &realhost, nodelay);
        if (error) {
            fprintf(stderr, "Unable to open connection:\n%s", error);
            return 1;
        }
-       logctx = log_init(NULL);
+       logctx = log_init(NULL, &cfg);
        back->provide_logctx(backhandle, logctx);
+       console_provide_logctx(logctx);
        sfree(realhost);
     }
     connopen = 1;