X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e2a197cf4658f554fc653403bfe8aa340ae8c2fa..a832773496d46caa5e328d36a15b4918f24a804e:/scp.c

diff --git a/scp.c b/scp.c
index cc67a625..069f7ef9 100644
--- a/scp.c
+++ b/scp.c
@@ -83,10 +83,8 @@ static int recursive = 0;
 static int preserve = 0;
 static int targetshouldbedirectory = 0;
 static int statistics = 1;
-static int portnumber = 0;
 static int prev_stats_len = 0;
 static int scp_unsafe_mode = 0;
-static char *password = NULL;
 static int errs = 0;
 /* GUI Adaptation - Sept 2000 */
 #define NAME_STR_MAX 2048
@@ -101,6 +99,9 @@ static int gui_mode = 0;
 static char *gui_hwnd = NULL;
 static int using_sftp = 0;
 
+static Backend *back;
+static void *backhandle;
+
 static void source(char *src);
 static void rsource(char *src);
 static void sink(char *targ, char *src);
@@ -119,7 +120,7 @@ static void gui_update_stats(char *name, unsigned long size,
  */
 #define MAX_SCP_BUFSIZE 16384
 
-void ldisc_send(char *buf, int len, int interactive)
+void ldisc_send(void *handle, char *buf, int len, int interactive)
 {
     /*
      * This is only here because of the calls to ldisc_send(NULL,
@@ -236,7 +237,30 @@ void fatalbox(char *fmt, ...)
 
     cleanup_exit(1);
 }
-void connection_fatal(char *fmt, ...)
+void modalfatalbox(char *fmt, ...)
+{
+    char str[0x100];		       /* Make the size big enough */
+    va_list ap;
+    va_start(ap, fmt);
+    strcpy(str, "Fatal: ");
+    vsprintf(str + strlen(str), fmt, ap);
+    va_end(ap);
+    strcat(str, "\n");
+    tell_str(stderr, str);
+    errs++;
+
+    if (gui_mode) {
+	unsigned int msg_id = WM_RET_ERR_CNT;
+	if (list)
+	    msg_id = WM_LS_RET_ERR_CNT;
+	while (!PostMessage
+	       ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
+		0 /*lParam */ ))SleepEx(1000, TRUE);
+    }
+
+    cleanup_exit(1);
+}
+void connection_fatal(void *frontend, char *fmt, ...)
 {
     char str[0x100];		       /* Make the size big enough */
     va_list ap;
@@ -287,7 +311,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(int is_stderr, char *data, int datalen)
+int from_backend(void *frontend, int is_stderr, char *data, int datalen)
 {
     unsigned char *p = (unsigned char *) data;
     unsigned len = (unsigned) datalen;
@@ -387,7 +411,7 @@ static void ssh_scp_init(void)
 {
     if (scp_ssh_socket == INVALID_SOCKET)
 	return;
-    while (!back->sendok()) {
+    while (!back->sendok(backhandle)) {
 	fd_set readfds;
 	FD_ZERO(&readfds);
 	FD_SET(scp_ssh_socket, &readfds);
@@ -395,7 +419,7 @@ static void ssh_scp_init(void)
 	    return;		       /* doom */
 	select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
     }
-    using_sftp = !ssh_fallback_cmd;
+    using_sftp = !ssh_fallback_cmd(backhandle);
 }
 
 /*
@@ -413,9 +437,9 @@ static void bump(char *fmt, ...)
     tell_str(stderr, str);
     errs++;
 
-    if (back != NULL && back->socket() != NULL) {
+    if (back != NULL && back->socket(backhandle) != NULL) {
 	char ch;
-	back->special(TS_EOF);
+	back->special(backhandle, TS_EOF);
 	ssh_scp_recv(&ch, 1);
     }
 
@@ -449,7 +473,15 @@ static void do_cmd(char *host, char *user, char *cmd)
 	do_defaults(NULL, &cfg);
 	strncpy(cfg.host, host, sizeof(cfg.host) - 1);
 	cfg.host[sizeof(cfg.host) - 1] = '\0';
-	cfg.port = 22;
+    }
+
+    /*
+     * Force use of SSH. (If they got the protocol wrong we assume the
+     * port is useless too.)
+     */
+    if (cfg.protocol != PROT_SSH) {
+        cfg.protocol = PROT_SSH;
+        cfg.port = 22;
     }
 
     /*
@@ -483,6 +515,21 @@ static void do_cmd(char *host, char *user, char *cmd)
      */
     cfg.host[strcspn(cfg.host, ":")] = '\0';
 
+    /*
+     * Remove any remaining whitespace from the hostname.
+     */
+    {
+	int p1 = 0, p2 = 0;
+	while (cfg.host[p2] != '\0') {
+	    if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
+		cfg.host[p1] = cfg.host[p2];
+		p1++;
+	    }
+	    p2++;
+	}
+	cfg.host[p1] = '\0';
+    }
+
     /* Set username */
     if (user != NULL && user[0] != '\0') {
 	strncpy(cfg.username, user, sizeof(cfg.username) - 1);
@@ -500,12 +547,6 @@ static void do_cmd(char *host, char *user, char *cmd)
 	free(user);
     }
 
-    if (cfg.protocol != PROT_SSH)
-	cfg.port = 22;
-
-    if (portnumber)
-	cfg.port = portnumber;
-
     /*
      * Disable scary things which shouldn't be enabled for simple
      * things like SCP and SFTP: agent forwarding, port forwarding,
@@ -527,9 +568,11 @@ static void do_cmd(char *host, char *user, char *cmd)
 
     back = &ssh_backend;
 
-    err = back->init(cfg.host, cfg.port, &realhost, 0);
+    err = back->init(NULL, &backhandle, cfg.host, cfg.port, &realhost, 0);
     if (err != NULL)
 	bump("ssh_init: %s", err);
+    logctx = log_init(NULL);
+    back->provide_logctx(backhandle, logctx);
     ssh_scp_init();
     if (verbose && realhost != NULL)
 	tell_user(stderr, "Connected to %s\n", realhost);
@@ -674,7 +717,7 @@ int sftp_recvdata(char *buf, int len)
 }
 int sftp_senddata(char *buf, int len)
 {
-    back->send((unsigned char *) buf, len);
+    back->send(backhandle, (unsigned char *) buf, len);
     return 1;
 }
 
@@ -786,7 +829,7 @@ void scp_source_setup(char *target, int shouldbedir)
 	if (!fxp_init()) {
 	    tell_user(stderr, "unable to initialise SFTP: %s", fxp_error());
 	    errs++;
-	    return 1;
+	    return;
 	}
 
 	if (!fxp_stat(target, &attrs) ||
@@ -812,8 +855,8 @@ int scp_send_errmsg(char *str)
     if (using_sftp) {
 	/* do nothing; we never need to send our errors to the server */
     } else {
-	back->send("\001", 1);	       /* scp protocol error prefix */
-	back->send(str, strlen(str));
+	back->send(backhandle, "\001", 1);/* scp protocol error prefix */
+	back->send(backhandle, str, strlen(str));
     }
     return 0;			       /* can't fail */
 }
@@ -828,7 +871,7 @@ int scp_send_filetimes(unsigned long mtime, unsigned long atime)
     } else {
 	char buf[80];
 	sprintf(buf, "T%lu 0 %lu 0\n", mtime, atime);
-	back->send(buf, strlen(buf));
+	back->send(backhandle, buf, strlen(buf));
 	return response();
     }
 }
@@ -856,9 +899,9 @@ int scp_send_filename(char *name, unsigned long size, int modes)
     } else {
 	char buf[40];
 	sprintf(buf, "C%04o %lu ", modes, size);
-	back->send(buf, strlen(buf));
-	back->send(name, strlen(name));
-	back->send("\n", 1);
+	back->send(backhandle, buf, strlen(buf));
+	back->send(backhandle, name, strlen(name));
+	back->send(backhandle, "\n", 1);
 	return response();
     }
 }
@@ -877,7 +920,7 @@ int scp_send_filedata(char *data, int len)
 	scp_sftp_fileoffset = uint64_add32(scp_sftp_fileoffset, len);
 	return 0;
     } else {
-	int bufsize = back->send(data, len);
+	int bufsize = back->send(backhandle, data, len);
 
 	/*
 	 * If the network transfer is backing up - that is, the
@@ -888,7 +931,7 @@ int scp_send_filedata(char *data, int len)
 	while (bufsize > MAX_SCP_BUFSIZE) {
 	    if (!scp_process_network_event())
 		return 1;
-	    bufsize = back->sendbuffer();
+	    bufsize = back->sendbuffer(backhandle);
 	}
 
 	return 0;
@@ -915,7 +958,7 @@ int scp_send_finish(void)
 	scp_has_times = 0;
 	return 0;
     } else {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
 	return response();
     }
 }
@@ -972,9 +1015,9 @@ int scp_send_dirname(char *name, int modes)
     } else {
 	char buf[40];
 	sprintf(buf, "D%04o 0 ", modes);
-	back->send(buf, strlen(buf));
-	back->send(name, strlen(name));
-	back->send("\n", 1);
+	back->send(backhandle, buf, strlen(buf));
+	back->send(backhandle, name, strlen(name));
+	back->send(backhandle, "\n", 1);
 	return response();
     }
 }
@@ -985,7 +1028,7 @@ int scp_send_enddir(void)
 	sfree(scp_sftp_remotepath);
 	return 0;
     } else {
-	back->send("E\n", 2);
+	back->send(backhandle, "E\n", 2);
 	return response();
     }
 }
@@ -1080,7 +1123,7 @@ int scp_sink_setup(char *source, int preserve, int recursive)
 int scp_sink_init(void)
 {
     if (!using_sftp) {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
     }
     return 0;
 }
@@ -1366,14 +1409,14 @@ int scp_get_sink_action(struct scp_sink_action *act)
 	      case '\02':		       /* fatal error */
 		bump("%s", act->buf);
 	      case 'E':
-		back->send("", 1);
+		back->send(backhandle, "", 1);
 		act->action = SCP_SINK_ENDDIR;
 		return 0;
 	      case 'T':
 		if (sscanf(act->buf, "%ld %*d %ld %*d",
 			   &act->mtime, &act->atime) == 2) {
 		    act->settime = 1;
-		    back->send("", 1);
+		    back->send(backhandle, "", 1);
 		    continue;	       /* go round again */
 		}
 		bump("Protocol error: Illegal time format");
@@ -1417,7 +1460,7 @@ int scp_accept_filexfer(void)
 	sfree(scp_sftp_currentname);
 	return 0;
     } else {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
 	return 0;		       /* can't fail */
     }
 }
@@ -1449,7 +1492,7 @@ int scp_finish_filerecv(void)
 	fxp_close(scp_sftp_filehandle);
 	return 0;
     } else {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
 	return response();
     }
 }
@@ -2196,9 +2239,9 @@ int main(int argc, char *argv[])
 	    tolocal(argc, argv);
     }
 
-    if (back != NULL && back->socket() != NULL) {
+    if (back != NULL && back->socket(backhandle) != NULL) {
 	char ch;
-	back->special(TS_EOF);
+	back->special(backhandle, TS_EOF);
 	ssh_scp_recv(&ch, 1);
     }
     WSACleanup();