Failure to set multipliers[NPRIMES] was rendering the input-modulus

[u/mdw/putty] / scp.c

diff --git a/scp.c b/scp.c
index 8f21a7f..de9559b 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -305,6 +305,16 @@ char *do_select(SOCKET skt, int startup)
 extern int select_result(WPARAM, LPARAM);
 
 /*
+ * In pscp, all agent requests should be synchronous, so this is a
+ * never-called stub.
+ */
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+                            void *callback_ctx, void *data, int len)
+{
+    assert(!"We shouldn't be here");
+}
+
+/*
  * Receive a block of data from the SSH link. Block until all data
  * is available.
  *
@@ -425,6 +435,12 @@ static void ssh_scp_init(void)
        select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
     }
     using_sftp = !ssh_fallback_cmd(backhandle);
+    if (verbose) {
+       if (using_sftp)
+           tell_user(stderr, "Using SFTP");
+       else
+           tell_user(stderr, "Using SCP1");
+    }
 }
 
 /*
@@ -466,7 +482,8 @@ static void bump(char *fmt, ...)
  */
 static void do_cmd(char *host, char *user, char *cmd)
 {
-    char *err, *realhost;
+    const char *err;
+    char *realhost;
     DWORD namelen;
 
     if (host == NULL || host[0] == '\0')
@@ -2178,7 +2195,7 @@ int main(int argc, char *argv[])
 
     default_protocol = PROT_TELNET;
 
-    flags = FLAG_STDERR;
+    flags = FLAG_STDERR | FLAG_SYNCAGENT;
     cmdline_tooltype = TOOLTYPE_FILETRANSFER;
     ssh_get_line = &console_get_line;
     init_winsock();