X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/e2a197cf4658f554fc653403bfe8aa340ae8c2fa..818ab3bbbe73842da6b50d75ad4a64e40de5e2e6:/scp.c

diff --git a/scp.c b/scp.c
index cc67a625..ec3575b7 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
@@ -236,6 +234,29 @@ void fatalbox(char *fmt, ...)
 
     cleanup_exit(1);
 }
+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(char *fmt, ...)
 {
     char str[0x100];		       /* Make the size big enough */
@@ -287,7 +308,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;
@@ -449,7 +470,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 +512,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 +544,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,7 +565,7 @@ 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, cfg.host, cfg.port, &realhost, 0);
     if (err != NULL)
 	bump("ssh_init: %s", err);
     ssh_scp_init();