X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/887035a593c8c0a1af853657c80046e17dc5581a..9ec95c23db58dac88a48fae594ea978c148d1c61:/scp.c

diff --git a/scp.c b/scp.c
index ec3575b7..0c7fe74d 100644
--- a/scp.c
+++ b/scp.c
@@ -99,6 +99,10 @@ static int gui_mode = 0;
 static char *gui_hwnd = NULL;
 static int using_sftp = 0;
 
+static Backend *back;
+static void *backhandle;
+static Config cfg;
+
 static void source(char *src);
 static void rsource(char *src);
 static void sink(char *targ, char *src);
@@ -117,7 +121,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,
@@ -157,13 +161,15 @@ static void tell_str(FILE * stream, char *str)
 
 static void tell_user(FILE * stream, char *fmt, ...)
 {
-    char str[0x100];		       /* Make the size big enough */
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
-    vsprintf(str, fmt, ap);
+    str = dupvprintf(fmt, ap);
     va_end(ap);
-    strcat(str, "\n");
-    tell_str(stream, str);
+    str2 = dupcat(str, "\n", NULL);
+    sfree(str);
+    tell_str(stream, str2);
+    sfree(str2);
 }
 
 static void gui_update_stats(char *name, unsigned long size,
@@ -213,14 +219,15 @@ static void gui_update_stats(char *name, unsigned long size,
  */
 void fatalbox(char *fmt, ...)
 {
-    char str[0x100];		       /* Make the size big enough */
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
-    strcpy(str, "Fatal: ");
-    vsprintf(str + strlen(str), fmt, ap);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("Fatal: ", str, "\n", NULL);
+    sfree(str);
     va_end(ap);
-    strcat(str, "\n");
-    tell_str(stderr, str);
+    tell_str(stderr, str2);
+    sfree(str2);
     errs++;
 
     if (gui_mode) {
@@ -236,14 +243,15 @@ void fatalbox(char *fmt, ...)
 }
 void modalfatalbox(char *fmt, ...)
 {
-    char str[0x100];		       /* Make the size big enough */
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
-    strcpy(str, "Fatal: ");
-    vsprintf(str + strlen(str), fmt, ap);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("Fatal: ", str, "\n", NULL);
+    sfree(str);
     va_end(ap);
-    strcat(str, "\n");
-    tell_str(stderr, str);
+    tell_str(stderr, str2);
+    sfree(str2);
     errs++;
 
     if (gui_mode) {
@@ -257,16 +265,17 @@ void modalfatalbox(char *fmt, ...)
 
     cleanup_exit(1);
 }
-void connection_fatal(char *fmt, ...)
+void connection_fatal(void *frontend, char *fmt, ...)
 {
-    char str[0x100];		       /* Make the size big enough */
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
-    strcpy(str, "Fatal: ");
-    vsprintf(str + strlen(str), fmt, ap);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("Fatal: ", str, "\n", NULL);
+    sfree(str);
     va_end(ap);
-    strcat(str, "\n");
-    tell_str(stderr, str);
+    tell_str(stderr, str2);
+    sfree(str2);
     errs++;
 
     if (gui_mode) {
@@ -296,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.
  *
@@ -308,7 +327,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;
@@ -344,8 +363,7 @@ int from_backend(void *frontend, int is_stderr, char *data, int datalen)
     if (len > 0) {
 	if (pendsize < pendlen + len) {
 	    pendsize = pendlen + len + 4096;
-	    pending = (pending ? srealloc(pending, pendsize) :
-		       smalloc(pendsize));
+	    pending = sresize(pending, pendsize, unsigned char);
 	    if (!pending)
 		fatalbox("Out of memory");
 	}
@@ -408,7 +426,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);
@@ -416,7 +434,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);
 }
 
 /*
@@ -424,19 +442,20 @@ static void ssh_scp_init(void)
  */
 static void bump(char *fmt, ...)
 {
-    char str[0x100];		       /* Make the size big enough */
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
-    strcpy(str, "Fatal: ");
-    vsprintf(str + strlen(str), fmt, ap);
+    str = dupvprintf(fmt, ap);
     va_end(ap);
-    strcat(str, "\n");
-    tell_str(stderr, str);
+    str2 = dupcat(str, "\n", NULL);
+    sfree(str);
+    tell_str(stderr, str2);
+    sfree(str2);
     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);
     }
 
@@ -457,7 +476,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')
@@ -484,7 +504,7 @@ static void do_cmd(char *host, char *user, char *cmd)
     /*
      * Enact command-line overrides.
      */
-    cmdline_run_saved();
+    cmdline_run_saved(&cfg);
 
     /*
      * Trim leading whitespace off the hostname if it's there.
@@ -535,7 +555,7 @@ static void do_cmd(char *host, char *user, char *cmd)
 	namelen = 0;
 	if (GetUserName(user, &namelen) == FALSE)
 	    bump("Empty user name");
-	user = smalloc(namelen * sizeof(char));
+	user = snewn(namelen, char);
 	GetUserName(user, &namelen);
 	if (verbose)
 	    tell_user(stderr, "Guessing user name: %s", user);
@@ -565,9 +585,12 @@ static void do_cmd(char *host, char *user, char *cmd)
 
     back = &ssh_backend;
 
-    err = back->init(NULL, cfg.host, cfg.port, &realhost, 0);
+    err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
     if (err != NULL)
 	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);
@@ -712,7 +735,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;
 }
 
@@ -764,8 +787,7 @@ void scp_sftp_listdir(char *dirname)
 
 	    if (nnames + names->nnames >= namesize) {
 		namesize += names->nnames + 128;
-		ournames =
-		    srealloc(ournames, namesize * sizeof(*ournames));
+		ournames = sresize(ournames, namesize, struct fxp_name);
 	    }
 
 	    for (i = 0; i < names->nnames; i++)
@@ -824,7 +846,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) ||
@@ -850,8 +872,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 */
 }
@@ -866,7 +888,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();
     }
 }
@@ -894,9 +916,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();
     }
 }
@@ -915,7 +937,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
@@ -926,7 +948,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;
@@ -953,7 +975,7 @@ int scp_send_finish(void)
 	scp_has_times = 0;
 	return 0;
     } else {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
 	return response();
     }
 }
@@ -1010,9 +1032,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();
     }
 }
@@ -1023,7 +1045,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();
     }
 }
@@ -1051,7 +1073,7 @@ int scp_sink_setup(char *source, int preserve, int recursive)
 	 * wildcardness comes before the final slash) and arrange
 	 * things so that a dirstack entry will be set up.
 	 */
-	newsource = smalloc(1+strlen(source));
+	newsource = snewn(1+strlen(source), char);
 	if (!wc_unescape(newsource, source)) {
 	    /* Yes, here we go; it's a wildcard. Bah. */
 	    char *dupsource, *lastpart, *dirpart, *wildcard;
@@ -1084,7 +1106,7 @@ int scp_sink_setup(char *source, int preserve, int recursive)
 	     * wildcard escapes from the directory part, throwing
 	     * an error if it contains a real wildcard.
 	     */
-	    dirpart = smalloc(1+strlen(dupsource));
+	    dirpart = snewn(1+strlen(dupsource), char);
 	    if (!wc_unescape(dirpart, dupsource)) {
 		tell_user(stderr, "%s: multiple-level wildcards unsupported",
 			  source);
@@ -1118,7 +1140,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;
 }
@@ -1293,8 +1315,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 		}
 		if (nnames + names->nnames >= namesize) {
 		    namesize += names->nnames + 128;
-		    ournames =
-			srealloc(ournames, namesize * sizeof(*ournames));
+		    ournames = sresize(ournames, namesize, struct fxp_name);
 		}
 		for (i = 0; i < names->nnames; i++)
 		    ournames[nnames++] = names->names[i];
@@ -1303,7 +1324,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 	    }
 	    fxp_close(dirhandle);
 
-	    newitem = smalloc(sizeof(struct scp_sftp_dirstack));
+	    newitem = snew(struct scp_sftp_dirstack);
 	    newitem->next = scp_sftp_dirstack_head;
 	    newitem->names = ournames;
 	    newitem->namepos = 0;
@@ -1391,7 +1412,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 		    bump("Lost connection");
 		if (i >= bufsize) {
 		    bufsize = i + 128;
-		    act->buf = srealloc(act->buf, bufsize);
+		    act->buf = sresize(act->buf, bufsize, char);
 		}
 		act->buf[i++] = ch;
 	    } while (ch != '\n');
@@ -1404,14 +1425,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");
@@ -1455,7 +1476,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 */
     }
 }
@@ -1487,7 +1508,7 @@ int scp_finish_filerecv(void)
 	fxp_close(scp_sftp_filehandle);
 	return 0;
     } else {
-	back->send("", 1);
+	back->send(backhandle, "", 1);
 	return response();
     }
 }
@@ -1498,16 +1519,17 @@ int scp_finish_filerecv(void)
  */
 static void run_err(const char *fmt, ...)
 {
-    char str[2048];
+    char *str, *str2;
     va_list ap;
     va_start(ap, fmt);
     errs++;
-    strcpy(str, "scp: ");
-    vsprintf(str + strlen(str), fmt, ap);
-    strcat(str, "\n");
-    scp_send_errmsg(str);
-    tell_user(stderr, "%s", str);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("scp: ", str, "\n", NULL);
+    sfree(str);
+    scp_send_errmsg(str2);
+    tell_user(stderr, "%s", str2);
     va_end(ap);
+    sfree(str2);
 }
 
 /*
@@ -1916,12 +1938,11 @@ static void toremote(int argc, char *argv[])
 	FindClose(fh);
     }
 
-    cmd = smalloc(strlen(targ) + 100);
-    sprintf(cmd, "scp%s%s%s%s -t %s",
-	    verbose ? " -v" : "",
-	    recursive ? " -r" : "",
-	    preserve ? " -p" : "",
-	    targetshouldbedirectory ? " -d" : "", targ);
+    cmd = dupprintf("scp%s%s%s%s -t %s",
+		    verbose ? " -v" : "",
+		    recursive ? " -r" : "",
+		    preserve ? " -p" : "",
+		    targetshouldbedirectory ? " -d" : "", targ);
     do_cmd(host, user, cmd);
     sfree(cmd);
 
@@ -2020,12 +2041,11 @@ static void tolocal(int argc, char *argv[])
 	    user = NULL;
     }
 
-    cmd = smalloc(strlen(src) + 100);
-    sprintf(cmd, "scp%s%s%s%s -f %s",
-	    verbose ? " -v" : "",
-	    recursive ? " -r" : "",
-	    preserve ? " -p" : "",
-	    targetshouldbedirectory ? " -d" : "", src);
+    cmd = dupprintf("scp%s%s%s%s -f %s",
+		    verbose ? " -v" : "",
+		    recursive ? " -r" : "",
+		    preserve ? " -p" : "",
+		    targetshouldbedirectory ? " -d" : "", src);
     do_cmd(host, user, cmd);
     sfree(cmd);
 
@@ -2068,7 +2088,7 @@ static void get_dir_list(int argc, char *argv[])
 	    user = NULL;
     }
 
-    cmd = smalloc(4 * strlen(src) + 100);
+    cmd = snewn(4 * strlen(src) + 100, char);
     strcpy(cmd, "ls -la '");
     p = cmd + strlen(cmd);
     for (q = src; *q; q++) {
@@ -2156,7 +2176,7 @@ void cmdline_error(char *p, ...)
     va_start(ap, p);
     vfprintf(stderr, p, ap);
     va_end(ap);
-    fputc('\n', stderr);
+    fprintf(stderr, "\n      try typing just \"pscp\" for help\n");
     exit(1);
 }
 
@@ -2169,7 +2189,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();
@@ -2179,7 +2199,7 @@ int main(int argc, char *argv[])
 	int ret;
 	if (argv[i][0] != '-')
 	    break;
-	ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1);
+	ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1, &cfg);
 	if (ret == -2) {
 	    cmdline_error("option \"%s\" requires an argument", argv[i]);
 	} else if (ret == 2) {
@@ -2209,8 +2229,9 @@ int main(int argc, char *argv[])
 	} else if (strcmp(argv[i], "--") == 0) {
 	    i++;
 	    break;
-	} else
-	    usage();
+	} else {
+	    cmdline_error("unknown option \"%s\"", argv[i]);
+	}
     }
     argc -= i;
     argv += i;
@@ -2234,9 +2255,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();