X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/774204f5085f072bbbcfe2096f1e5a4bb6e030d8..1bc24185fa9eb390d005d9655be64b33c4a2287b:/psftp.c

diff --git a/psftp.c b/psftp.c
index 2815d35c..71d57471 100644
--- a/psftp.c
+++ b/psftp.c
@@ -25,13 +25,16 @@
  */
 
 static int psftp_connect(char *userhost, char *user, int portnumber);
-static void do_sftp_init(void);
+static int do_sftp_init(void);
 
 /* ----------------------------------------------------------------------
  * sftp client state.
  */
 
 char *pwd, *homedir;
+static Backend *back;
+static void *backhandle;
+static Config cfg;
 
 /* ----------------------------------------------------------------------
  * Higher-level helper functions used in commands.
@@ -45,6 +48,8 @@ char *pwd, *homedir;
 char *canonify(char *name)
 {
     char *fullname, *canonname;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
 
     if (name[0] == '/') {
 	fullname = dupstr(name);
@@ -57,7 +62,10 @@ char *canonify(char *name)
 	fullname = dupcat(pwd, slash, name, NULL);
     }
 
-    canonname = fxp_realpath(fullname);
+    sftp_register(req = fxp_realpath_send(fullname));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    canonname = fxp_realpath_recv(pktin);
 
     if (canonname) {
 	sfree(fullname);
@@ -112,10 +120,13 @@ char *canonify(char *name)
 	 */
 	fullname[i] = '\0';	       /* separate the string */
 	if (i == 0) {
-	    canonname = fxp_realpath("/");
+	    sftp_register(req = fxp_realpath_send("/"));
 	} else {
-	    canonname = fxp_realpath(fullname);
+	    sftp_register(req = fxp_realpath_send(fullname));
 	}
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	canonname = fxp_realpath_recv(pktin);
 
 	if (!canonname)
 	    return fullname;	       /* even that failed; give up */
@@ -188,17 +199,19 @@ int sftp_cmd_quit(struct sftp_command *cmd)
  */
 static int sftp_ls_compare(const void *av, const void *bv)
 {
-    const struct fxp_name *a = (const struct fxp_name *) av;
-    const struct fxp_name *b = (const struct fxp_name *) bv;
-    return strcmp(a->filename, b->filename);
+    const struct fxp_name *const *a = (const struct fxp_name *const *) av;
+    const struct fxp_name *const *b = (const struct fxp_name *const *) bv;
+    return strcmp((*a)->filename, (*b)->filename);
 }
 int sftp_cmd_ls(struct sftp_command *cmd)
 {
     struct fxp_handle *dirh;
     struct fxp_names *names;
-    struct fxp_name *ournames;
+    struct fxp_name **ournames;
     int nnames, namesize;
     char *dir, *cdir;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     int i;
 
     if (back == NULL) {
@@ -219,7 +232,11 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 
     printf("Listing directory %s\n", cdir);
 
-    dirh = fxp_opendir(cdir);
+    sftp_register(req = fxp_opendir_send(cdir));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    dirh = fxp_opendir_recv(pktin);
+
     if (dirh == NULL) {
 	printf("Unable to open %s: %s\n", dir, fxp_error());
     } else {
@@ -228,7 +245,11 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 
 	while (1) {
 
-	    names = fxp_readdir(dirh);
+	    sftp_register(req = fxp_readdir_send(dirh));
+	    rreq = sftp_find_request(pktin = sftp_recv());
+	    assert(rreq == req);
+	    names = fxp_readdir_recv(pktin);
+
 	    if (names == NULL) {
 		if (fxp_error_type() == SSH_FX_EOF)
 		    break;
@@ -242,17 +263,18 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 
 	    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];
+		ournames[nnames++] = fxp_dup_name(&names->names[i]);
 
-	    names->nnames = 0;	       /* prevent free_names */
 	    fxp_free_names(names);
 	}
-	fxp_close(dirh);
+	sftp_register(req = fxp_close_send(dirh));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	fxp_close_recv(pktin);
 
 	/*
 	 * Now we have our filenames. Sort them by actual file
@@ -263,8 +285,11 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 	/*
 	 * And print them.
 	 */
-	for (i = 0; i < nnames; i++)
-	    printf("%s\n", ournames[i].longname);
+	for (i = 0; i < nnames; i++) {
+	    printf("%s\n", ournames[i]->longname);
+	    fxp_free_name(ournames[i]);
+	}
+	sfree(ournames);
     }
 
     sfree(cdir);
@@ -279,6 +304,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 int sftp_cmd_cd(struct sftp_command *cmd)
 {
     struct fxp_handle *dirh;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     char *dir;
 
     if (back == NULL) {
@@ -296,14 +323,21 @@ int sftp_cmd_cd(struct sftp_command *cmd)
 	return 0;
     }
 
-    dirh = fxp_opendir(dir);
+    sftp_register(req = fxp_opendir_send(dir));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    dirh = fxp_opendir_recv(pktin);
+
     if (!dirh) {
 	printf("Directory %s: %s\n", dir, fxp_error());
 	sfree(dir);
 	return 0;
     }
 
-    fxp_close(dirh);
+    sftp_register(req = fxp_close_send(dirh));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    fxp_close_recv(pktin);
 
     sfree(pwd);
     pwd = dir;
@@ -335,6 +369,8 @@ int sftp_cmd_pwd(struct sftp_command *cmd)
 int sftp_general_get(struct sftp_command *cmd, int restart)
 {
     struct fxp_handle *fh;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     char *fname, *outfname;
     uint64 offset;
     FILE *fp;
@@ -358,7 +394,11 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
     outfname = (cmd->nwords == 2 ?
 		stripslashes(cmd->words[1], 0) : cmd->words[2]);
 
-    fh = fxp_open(fname, SSH_FXF_READ);
+    sftp_register(req = fxp_open_send(fname, SSH_FXF_READ));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    fh = fxp_open_recv(pktin);
+
     if (!fh) {
 	printf("%s: %s\n", fname, fxp_error());
 	sfree(fname);
@@ -373,7 +413,12 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
 
     if (!fp) {
 	printf("local: unable to open %s\n", outfname);
-	fxp_close(fh);
+
+	sftp_register(req = fxp_close_send(fh));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	fxp_close_recv(pktin);
+
 	sfree(fname);
 	return 0;
     }
@@ -400,7 +445,11 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
 	int len;
 	int wpos, wlen;
 
-	len = fxp_read(fh, buffer, offset, sizeof(buffer));
+	sftp_register(req = fxp_read_send(fh, offset, sizeof(buffer)));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	len = fxp_read_recv(pktin, buffer, sizeof(buffer));
+
 	if ((len == -1 && fxp_error_type() == SSH_FX_EOF) || len == 0)
 	    break;
 	if (len == -1) {
@@ -427,7 +476,12 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
     }
 
     fclose(fp);
-    fxp_close(fh);
+
+    sftp_register(req = fxp_close_send(fh));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    fxp_close_recv(pktin);
+
     sfree(fname);
 
     return ret;
@@ -451,6 +505,8 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
 {
     struct fxp_handle *fh;
     char *fname, *origoutfname, *outfname;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     uint64 offset;
     FILE *fp;
     int ret;
@@ -481,12 +537,15 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
 	return 0;
     }
     if (restart) {
-	fh = fxp_open(outfname,
-		      SSH_FXF_WRITE);
+	sftp_register(req = fxp_open_send(outfname, SSH_FXF_WRITE));
     } else {
-	fh = fxp_open(outfname,
-		      SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC);
+	sftp_register(req = fxp_open_send(outfname, SSH_FXF_WRITE |
+					  SSH_FXF_CREAT | SSH_FXF_TRUNC));
     }
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    fh = fxp_open_recv(pktin);
+
     if (!fh) {
 	printf("%s: %s\n", outfname, fxp_error());
 	sfree(outfname);
@@ -496,7 +555,14 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
     if (restart) {
 	char decbuf[30];
 	struct fxp_attrs attrs;
-	if (!fxp_fstat(fh, &attrs)) {
+	int ret;
+
+	sftp_register(req = fxp_fstat_send(fh));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	ret = fxp_fstat_recv(pktin, &attrs);
+
+	if (!ret) {
 	    printf("read size of %s: %s\n", outfname, fxp_error());
 	    sfree(outfname);
 	    return 0;
@@ -529,7 +595,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
     ret = 1;
     while (1) {
 	char buffer[4096];
-	int len;
+	int len, ret;
 
 	len = fread(buffer, 1, sizeof(buffer), fp);
 	if (len == -1) {
@@ -539,7 +605,13 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
 	} else if (len == 0) {
 	    break;
 	}
-	if (!fxp_write(fh, buffer, offset, len)) {
+
+	sftp_register(req = fxp_write_send(fh, buffer, offset, len));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	ret = fxp_write_recv(pktin);
+
+	if (!ret) {
 	    printf("error while writing: %s\n", fxp_error());
 	    ret = 0;
 	    break;
@@ -547,7 +619,11 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
 	offset = uint64_add32(offset, len);
     }
 
-    fxp_close(fh);
+    sftp_register(req = fxp_close_send(fh));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    fxp_close_recv(pktin);
+
     fclose(fp);
     sfree(outfname);
 
@@ -565,6 +641,8 @@ int sftp_cmd_reput(struct sftp_command *cmd)
 int sftp_cmd_mkdir(struct sftp_command *cmd)
 {
     char *dir;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     int result;
 
     if (back == NULL) {
@@ -583,7 +661,11 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
 	return 0;
     }
 
-    result = fxp_mkdir(dir);
+    sftp_register(req = fxp_mkdir_send(dir));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_mkdir_recv(pktin);
+
     if (!result) {
 	printf("mkdir %s: %s\n", dir, fxp_error());
 	sfree(dir);
@@ -597,6 +679,8 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
 int sftp_cmd_rmdir(struct sftp_command *cmd)
 {
     char *dir;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     int result;
 
     if (back == NULL) {
@@ -615,7 +699,11 @@ int sftp_cmd_rmdir(struct sftp_command *cmd)
 	return 0;
     }
 
-    result = fxp_rmdir(dir);
+    sftp_register(req = fxp_rmdir_send(dir));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_rmdir_recv(pktin);
+
     if (!result) {
 	printf("rmdir %s: %s\n", dir, fxp_error());
 	sfree(dir);
@@ -629,6 +717,8 @@ int sftp_cmd_rmdir(struct sftp_command *cmd)
 int sftp_cmd_rm(struct sftp_command *cmd)
 {
     char *fname;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     int result;
 
     if (back == NULL) {
@@ -647,7 +737,11 @@ int sftp_cmd_rm(struct sftp_command *cmd)
 	return 0;
     }
 
-    result = fxp_remove(fname);
+    sftp_register(req = fxp_remove_send(fname));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_remove_recv(pktin);
+
     if (!result) {
 	printf("rm %s: %s\n", fname, fxp_error());
 	sfree(fname);
@@ -661,6 +755,8 @@ int sftp_cmd_rm(struct sftp_command *cmd)
 int sftp_cmd_mv(struct sftp_command *cmd)
 {
     char *srcfname, *dstfname;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
     int result;
 
     if (back == NULL) {
@@ -684,7 +780,11 @@ int sftp_cmd_mv(struct sftp_command *cmd)
 	return 0;
     }
 
-    result = fxp_rename(srcfname, dstfname);
+    sftp_register(req = fxp_rename_send(srcfname, dstfname));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_rename_recv(pktin);
+
     if (!result) {
 	char const *error = fxp_error();
 	struct fxp_attrs attrs;
@@ -695,7 +795,11 @@ int sftp_cmd_mv(struct sftp_command *cmd)
 	 * _is_ a directory, we re-attempt the move by appending
 	 * the basename of srcfname to dstfname.
 	 */
-	result = fxp_stat(dstfname, &attrs);
+	sftp_register(req = fxp_stat_send(dstfname));
+	rreq = sftp_find_request(pktin = sftp_recv());
+	assert(rreq == req);
+	result = fxp_stat_recv(pktin, &attrs);
+
 	if (result &&
 	    (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
 	    (attrs.permissions & 0040000)) {
@@ -710,7 +814,12 @@ int sftp_cmd_mv(struct sftp_command *cmd)
 	    if (newcanon) {
 		sfree(dstfname);
 		dstfname = newcanon;
-		result = fxp_rename(srcfname, dstfname);
+
+		sftp_register(req = fxp_rename_send(srcfname, dstfname));
+		rreq = sftp_find_request(pktin = sftp_recv());
+		assert(rreq == req);
+		result = fxp_rename_recv(pktin);
+
 		error = result ? NULL : fxp_error();
 	    }
 	}
@@ -734,6 +843,8 @@ int sftp_cmd_chmod(struct sftp_command *cmd)
     int result;
     struct fxp_attrs attrs;
     unsigned attrs_clr, attrs_xor, oldperms, newperms;
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
 
     if (back == NULL) {
 	printf("psftp: not connected to a host; use \"open host.name\"\n");
@@ -828,7 +939,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd)
 	    if (!(subset & 06777) && (perms &~ subset)) {
 		printf("chmod: file mode '%.*s' contains no user/group/other"
 		       " specifier and permissions other than 't' \n",
-		       strcspn(modebegin, ","), modebegin, *mode);
+		       strcspn(modebegin, ","), modebegin);
 		return 0;
 	    }
 	    perms &= subset;
@@ -856,7 +967,11 @@ int sftp_cmd_chmod(struct sftp_command *cmd)
 	return 0;
     }
 
-    result = fxp_stat(fname, &attrs);
+    sftp_register(req = fxp_stat_send(fname));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_stat_recv(pktin, &attrs);
+
     if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
 	printf("get attrs for %s: %s\n", fname,
 	       result ? "file permissions not provided" : fxp_error());
@@ -870,7 +985,10 @@ int sftp_cmd_chmod(struct sftp_command *cmd)
     attrs.permissions ^= attrs_xor;
     newperms = attrs.permissions & 07777;
 
-    result = fxp_setstat(fname, attrs);
+    sftp_register(req = fxp_setstat_send(fname, attrs));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    result = fxp_setstat_recv(pktin);
 
     if (!result) {
 	printf("set attrs for %s: %s\n", fname, fxp_error());
@@ -929,10 +1047,10 @@ static int sftp_cmd_lcd(struct sftp_command *cmd)
 	return 0;
     }
 
-    currdir = smalloc(256);
+    currdir = snewn(256, char);
     len = GetCurrentDirectory(256, currdir);
     if (len > 256)
-	currdir = srealloc(currdir, len);
+	currdir = sresize(currdir, len, char);
     GetCurrentDirectory(len, currdir);
     printf("New local directory is %s\n", currdir);
     sfree(currdir);
@@ -945,10 +1063,10 @@ static int sftp_cmd_lpwd(struct sftp_command *cmd)
     char *currdir;
     int len;
 
-    currdir = smalloc(256);
+    currdir = snewn(256, char);
     len = GetCurrentDirectory(256, currdir);
     if (len > 256)
-	currdir = srealloc(currdir, len);
+	currdir = sresize(currdir, len, char);
     GetCurrentDirectory(len, currdir);
     printf("Current local directory is %s\n", currdir);
     sfree(currdir);
@@ -1249,7 +1367,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
     }
     fflush(stdout);
 
-    cmd = smalloc(sizeof(struct sftp_command));
+    cmd = snew(struct sftp_command);
     cmd->words = NULL;
     cmd->nwords = 0;
     cmd->wordssize = 0;
@@ -1261,7 +1379,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 	char *ret;
 
 	linesize += 512;
-	line = srealloc(line, linesize);
+	line = sresize(line, linesize, char);
 	ret = fgets(line + linelen, linesize - linelen, fp);
 
 	if (!ret || (linelen == 0 && line[0] == '\0')) {
@@ -1293,7 +1411,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 	 * containing everything else on the line.
 	 */
 	cmd->nwords = cmd->wordssize = 2;
-	cmd->words = srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+	cmd->words = sresize(cmd->words, cmd->wordssize, char *);
 	cmd->words[0] = "!";
 	cmd->words[1] = p+1;
     } else {
@@ -1336,8 +1454,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 	    *r = '\0';
 	    if (cmd->nwords >= cmd->wordssize) {
 		cmd->wordssize = cmd->nwords + 16;
-		cmd->words =
-		    srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+		cmd->words = sresize(cmd->words, cmd->wordssize, char *);
 	    }
 	    cmd->words[cmd->nwords++] = q;
 	}
@@ -1363,6 +1480,9 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 
 static int do_sftp_init(void)
 {
+    struct sftp_packet *pktin;
+    struct sftp_request *req, *rreq;
+
     /*
      * Do protocol initialisation. 
      */
@@ -1375,7 +1495,11 @@ static int do_sftp_init(void)
     /*
      * Find out where our home directory is.
      */
-    homedir = fxp_realpath(".");
+    sftp_register(req = fxp_realpath_send("."));
+    rreq = sftp_find_request(pktin = sftp_recv());
+    assert(rreq == req);
+    homedir = fxp_realpath_recv(pktin);
+
     if (!homedir) {
 	fprintf(stderr,
 		"Warning: failed to resolve home directory: %s\n",
@@ -1444,32 +1568,48 @@ static int verbose = 0;
  */
 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");
-    fputs(str, stderr);
+    fputs(str2, stderr);
+    sfree(str2);
 
-    exit(1);
+    cleanup_exit(1);
 }
-void connection_fatal(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");
-    fputs(str, stderr);
+    fputs(str2, stderr);
+    sfree(str2);
 
-    exit(1);
+    cleanup_exit(1);
+}
+void connection_fatal(void *frontend, char *fmt, ...)
+{
+    char *str, *str2;
+    va_list ap;
+    va_start(ap, fmt);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("Fatal: ", str, "\n", NULL);
+    sfree(str);
+    va_end(ap);
+    fputs(str2, stderr);
+    sfree(str2);
+
+    cleanup_exit(1);
 }
 
-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,
@@ -1495,6 +1635,16 @@ char *do_select(SOCKET skt, int startup)
 extern int select_result(WPARAM, LPARAM);
 
 /*
+ * In psftp, 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.
  *
@@ -1507,11 +1657,13 @@ 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, const char *data, int datalen)
 {
     unsigned char *p = (unsigned char *) data;
     unsigned len = (unsigned) datalen;
 
+    assert(len > 0);
+
     /*
      * stderr data is just spouted to local stderr and otherwise
      * ignored.
@@ -1541,10 +1693,7 @@ int from_backend(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));
-	    if (!pending)
-		fatalbox("Out of memory");
+	    pending = sresize(pending, pendsize, unsigned char);
 	}
 	memcpy(pending + pendlen, p, len);
 	pendlen += len;
@@ -1593,7 +1742,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;
 }
 
@@ -1604,7 +1753,7 @@ static void ssh_sftp_init(void)
 {
     if (sftp_ssh_socket == INVALID_SOCKET)
 	return;
-    while (!back->sendok()) {
+    while (!back->sendok(backhandle)) {
 	fd_set readfds;
 	FD_ZERO(&readfds);
 	FD_SET(sftp_ssh_socket, &readfds);
@@ -1625,11 +1774,11 @@ static void init_winsock(void)
     winsock_ver = MAKEWORD(1, 1);
     if (WSAStartup(winsock_ver, &wsadata)) {
 	fprintf(stderr, "Unable to initialise WinSock");
-	exit(1);
+	cleanup_exit(1);
     }
     if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
 	fprintf(stderr, "WinSock version is incompatible with 1.1");
-	exit(1);
+	cleanup_exit(1);
     }
 }
 
@@ -1646,9 +1795,15 @@ static void usage(void)
     printf("  -bc       output batchfile commands\n");
     printf("  -be       don't stop batchfile processing if errors\n");
     printf("  -v        show verbose messages\n");
+    printf("  -load sessname  Load settings from saved session\n");
+    printf("  -l user   connect with specified username\n");
     printf("  -P port   connect to specified port\n");
     printf("  -pw passw login with specified password\n");
-    exit(1);
+    printf("  -1 -2     force use of particular SSH protocol version\n");
+    printf("  -C        enable compression\n");
+    printf("  -i key    private key file for authentication\n");
+    printf("  -batch    disable all interactive prompts\n");
+    cleanup_exit(1);
 }
 
 /*
@@ -1657,7 +1812,7 @@ static void usage(void)
 static int psftp_connect(char *userhost, char *user, int portnumber)
 {
     char *host, *realhost;
-    char *err;
+    const char *err;
 
     /* Separate host and username */
     host = userhost;
@@ -1680,10 +1835,23 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 	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;
+    }
+
+    /*
+     * Enact command-line overrides.
+     */
+    cmdline_run_saved(&cfg);
+
+    /*
      * Trim leading whitespace off the hostname if it's there.
      */
     {
@@ -1709,6 +1877,21 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
      */
     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);
@@ -1716,9 +1899,10 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
     }
     if (!cfg.username[0]) {
 	printf("login as: ");
+	fflush(stdout);
 	if (!fgets(cfg.username, sizeof(cfg.username), stdin)) {
 	    fprintf(stderr, "psftp: aborting\n");
-	    exit(1);
+	    cleanup_exit(1);
 	} else {
 	    int len = strlen(cfg.username);
 	    if (cfg.username[len - 1] == '\n')
@@ -1726,9 +1910,6 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 	}
     }
 
-    if (cfg.protocol != PROT_SSH)
-	cfg.port = 22;
-
     if (portnumber)
 	cfg.port = portnumber;
 
@@ -1774,17 +1955,31 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 
     back = &ssh_backend;
 
-    err = back->init(cfg.host, cfg.port, &realhost, 0);
+    err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
     if (err != NULL) {
 	fprintf(stderr, "ssh_init: %s\n", err);
 	return 1;
     }
+    logctx = log_init(NULL, &cfg);
+    back->provide_logctx(backhandle, logctx);
+    console_provide_logctx(logctx);
     ssh_sftp_init();
     if (verbose && realhost != NULL)
 	printf("Connected to %s\n", realhost);
     return 0;
 }
 
+void cmdline_error(char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "psftp: ");
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fprintf(stderr, "\n       try typing \"psftp -h\" for help\n");
+    exit(1);
+}
+
 /*
  * Main program. Parse arguments etc.
  */
@@ -1796,45 +1991,52 @@ int main(int argc, char *argv[])
     int mode = 0;
     int modeflags = 0;
     char *batchfile = NULL;
+    int errors = 0;
 
-    flags = FLAG_STDERR | FLAG_INTERACTIVE;
+    flags = FLAG_STDERR | FLAG_INTERACTIVE | FLAG_SYNCAGENT;
+    cmdline_tooltype = TOOLTYPE_FILETRANSFER;
     ssh_get_line = &console_get_line;
     init_winsock();
     sk_init();
 
     userhost = user = NULL;
 
+    errors = 0;
     for (i = 1; i < argc; i++) {
+	int ret;
 	if (argv[i][0] != '-') {
-	    if (userhost)
-		usage();
-	    else
-		userhost = dupstr(argv[i]);
-	} else if (strcmp(argv[i], "-v") == 0) {
-	    verbose = 1, flags |= FLAG_VERBOSE;
+            if (userhost)
+                usage();
+            else
+                userhost = dupstr(argv[i]);
+	    continue;
+	}
+	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) {
+	    i++;	       /* skip next argument */
+	} else if (ret == 1) {
+	    /* We have our own verbosity in addition to `flags'. */
+	    if (flags & FLAG_VERBOSE)
+		verbose = 1;
 	} else if (strcmp(argv[i], "-h") == 0 ||
 		   strcmp(argv[i], "-?") == 0) {
 	    usage();
-	} else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
-	    user = argv[++i];
-	} else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
-	    portnumber = atoi(argv[++i]);
-	} else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
-	    console_password = argv[++i];
+	} else if (strcmp(argv[i], "-batch") == 0) {
+	    console_batch_mode = 1;
 	} else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
 	    mode = 1;
 	    batchfile = argv[++i];
 	} else if (strcmp(argv[i], "-bc") == 0) {
 	    modeflags = modeflags | 1;
-	} else if (strcmp(argv[i], "-batch") == 0) {
-	    console_batch_mode = TRUE;
 	} else if (strcmp(argv[i], "-be") == 0) {
 	    modeflags = modeflags | 2;
 	} else if (strcmp(argv[i], "--") == 0) {
 	    i++;
 	    break;
 	} else {
-	    usage();
+	    cmdline_error("unknown option \"%s\"", argv[i]);
 	}
     }
     argc -= i;
@@ -1857,9 +2059,9 @@ int main(int argc, char *argv[])
 
     do_sftp(mode, modeflags, batchfile);
 
-    if (back != NULL && back->socket() != NULL) {
+    if (back != NULL && back->socket(backhandle) != NULL) {
 	char ch;
-	back->special(TS_EOF);
+	back->special(backhandle, TS_EOF);
 	sftp_recvdata(&ch, 1);
     }
     WSACleanup();