X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b51259f6a879f69bec5348bddb604d9b3d499941..5d145a14925b0ea8a60af808252a7c3cf78f9631:/psftp.c

diff --git a/psftp.c b/psftp.c
index 53896598..d395b6f1 100644
--- a/psftp.c
+++ b/psftp.c
@@ -370,6 +370,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
     struct fxp_handle *fh;
     struct sftp_packet *pktin;
     struct sftp_request *req, *rreq;
+    struct fxp_xfer *xfer;
     char *fname, *outfname;
     uint64 offset;
     FILE *fp;
@@ -439,41 +440,45 @@ int sftp_general_get(struct sftp_command *cmd, int restart)
      * thus put up a progress bar.
      */
     ret = 1;
-    while (1) {
-	char buffer[4096];
-	int len;
+    xfer = xfer_download_init(fh, offset);
+    while (!xfer_done(xfer)) {
+	void *vbuf;
+	int ret, len;
 	int wpos, wlen;
 
-	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, rreq, buffer, sizeof(buffer));
+	xfer_download_queue(xfer);
+	pktin = sftp_recv();
+	ret = xfer_download_gotpkt(xfer, pktin);
 
-	if ((len == -1 && fxp_error_type() == SSH_FX_EOF) || len == 0)
-	    break;
-	if (len == -1) {
-	    printf("error while reading: %s\n", fxp_error());
-	    ret = 0;
-	    break;
+	if (ret < 0) {
+            printf("error while reading: %s\n", fxp_error());
+            ret = 0;
 	}
 
-	wpos = 0;
-	while (wpos < len) {
-	    wlen = fwrite(buffer, 1, len - wpos, fp);
-	    if (wlen <= 0) {
-		printf("error while writing local file\n");
+	while (xfer_download_data(xfer, &vbuf, &len)) {
+	    unsigned char *buf = (unsigned char *)vbuf;
+
+	    wpos = 0;
+	    while (wpos < len) {
+		wlen = fwrite(buf + wpos, 1, len - wpos, fp);
+		if (wlen <= 0) {
+		    printf("error while writing local file\n");
+		    ret = 0;
+		    xfer_set_error(xfer);
+		}
+		wpos += wlen;
+	    }
+	    if (wpos < len) {	       /* we had an error */
 		ret = 0;
-		break;
+		xfer_set_error(xfer);
 	    }
-	    wpos += wlen;
-	}
-	if (wpos < len) {	       /* we had an error */
-	    ret = 0;
-	    break;
+
+	    sfree(vbuf);
 	}
-	offset = uint64_add32(offset, len);
     }
 
+    xfer_cleanup(xfer);
+
     fclose(fp);
 
     sftp_register(req = fxp_close_send(fh));
@@ -503,12 +508,13 @@ int sftp_cmd_reget(struct sftp_command *cmd)
 int sftp_general_put(struct sftp_command *cmd, int restart)
 {
     struct fxp_handle *fh;
+    struct fxp_xfer *xfer;
     char *fname, *origoutfname, *outfname;
     struct sftp_packet *pktin;
     struct sftp_request *req, *rreq;
     uint64 offset;
     FILE *fp;
-    int ret;
+    int ret, err, eof;
 
     if (back == NULL) {
 	printf("psftp: not connected to a host; use \"open host.name\"\n");
@@ -592,32 +598,36 @@ int sftp_general_put(struct sftp_command *cmd, int restart)
      * thus put up a progress bar.
      */
     ret = 1;
-    while (1) {
+    xfer = xfer_upload_init(fh, offset);
+    err = eof = 0;
+    while ((!err && !eof) || !xfer_done(xfer)) {
 	char buffer[4096];
 	int len, ret;
 
-	len = fread(buffer, 1, sizeof(buffer), fp);
-	if (len == -1) {
-	    printf("error while reading local file\n");
-	    ret = 0;
-	    break;
-	} else if (len == 0) {
-	    break;
+	while (xfer_upload_ready(xfer) && !err && !eof) {
+	    len = fread(buffer, 1, sizeof(buffer), fp);
+	    if (len == -1) {
+		printf("error while reading local file\n");
+		err = 1;
+	    } else if (len == 0) {
+		eof = 1;
+	    } else {
+		xfer_upload_data(xfer, buffer, 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, rreq);
-
-	if (!ret) {
-	    printf("error while writing: %s\n", fxp_error());
-	    ret = 0;
-	    break;
+	if (!xfer_done(xfer)) {
+	    pktin = sftp_recv();
+	    ret = xfer_upload_gotpkt(xfer, pktin);
+	    if (!ret) {
+		printf("error while writing: %s\n", fxp_error());
+		err = 1;
+	    }
 	}
-	offset = uint64_add32(offset, len);
     }
 
+    xfer_cleanup(xfer);
+
     sftp_register(req = fxp_close_send(fh));
     rreq = sftp_find_request(pktin = sftp_recv());
     assert(rreq == req);
@@ -1630,14 +1640,13 @@ 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.
      */
     if (is_stderr) {
-	fwrite(data, 1, len, stderr);
+	if (len > 0)
+	    fwrite(data, 1, len, stderr);
 	return 0;
     }
 
@@ -1647,7 +1656,7 @@ int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
     if (!outptr)
 	return 0;
 
-    if (outlen > 0) {
+    if ((outlen > 0) && (len > 0)) {
 	unsigned used = outlen;
 	if (used > len)
 	    used = len;