X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/c229ef97dfba4dee7d2fc0a098e0343dc87dc004..ec3f19be6a97c2f4e76f9d7749209a4581e39c93:/scp.c?ds=sidebyside diff --git a/scp.c b/scp.c index 9dda0672..40d05df4 100644 --- a/scp.c +++ b/scp.c @@ -101,6 +101,7 @@ static int using_sftp = 0; static Backend *back; static void *backhandle; +static Config cfg; static void source(char *src); static void rsource(char *src); @@ -316,7 +317,7 @@ static unsigned char *outptr; /* where to put the data */ static unsigned outlen; /* how much data required */ static unsigned char *pending = NULL; /* any spare data */ static unsigned pendlen = 0, pendsize = 0; /* length and phys. size of buffer */ -int from_backend(void *frontend, int is_stderr, char *data, int datalen) +int from_backend(void *frontend, int is_stderr, const char *data, int datalen) { unsigned char *p = (unsigned char *) data; unsigned len = (unsigned) datalen; @@ -579,6 +580,7 @@ static void do_cmd(char *host, char *user, char *cmd) bump("ssh_init: %s", err); logctx = log_init(NULL, &cfg); back->provide_logctx(backhandle, logctx); + console_provide_logctx(logctx); ssh_scp_init(); if (verbose && realhost != NULL) tell_user(stderr, "Connected to %s\n", realhost);