X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=psftp.c;h=1d331603cbf7f5ea67a641466ce1eba546c9d670;hb=f3685eb9482ab98e7c7ecee06970795a016834b6;hp=33fbf086d88f6bd7d29a488a1db9f3ee56353d13;hpb=2c586ee2cd6e3ad3c39002e44e6cf73a3b702614;p=PuTTY.git

diff --git a/psftp.c b/psftp.c
index 33fbf086..1d331603 100644
--- a/psftp.c
+++ b/psftp.c
@@ -291,6 +291,11 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
 		    if (fxp_error_type() == SSH_FX_EOF)
 			break;
 		    printf("%s: reading directory: %s\n", fname, fxp_error());
+
+                    req = fxp_close_send(dirhandle);
+                    pktin = sftp_wait_for_reply(req);
+                    fxp_close_recv(pktin, req);
+
 		    sfree(ournames);
 		    return 0;
 		}
@@ -327,7 +332,8 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
 	     * readdirs on the same remote directory return a
 	     * different order.
 	     */
-	    qsort(ournames, nnames, sizeof(*ournames), sftp_name_compare);
+            if (nnames > 0)
+                qsort(ournames, nnames, sizeof(*ournames), sftp_name_compare);
 
 	    /*
 	     * If we're in restart mode, find the last filename on
@@ -342,11 +348,8 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
                 while (i < nnames) {
                     char *nextoutfname;
                     int ret;
-                    if (outfname)
-                        nextoutfname = dir_file_cat(outfname,
-                                                    ournames[i]->filename);
-                    else
-                        nextoutfname = dupstr(ournames[i]->filename);
+                    nextoutfname = dir_file_cat(outfname,
+                                                ournames[i]->filename);
                     ret = (file_type(nextoutfname) == FILE_TYPE_NONEXISTENT);
                     sfree(nextoutfname);
                     if (ret)
@@ -368,11 +371,7 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
 		int ret;
 		
 		nextfname = dupcat(fname, "/", ournames[i]->filename, NULL);
-		if (outfname)
-		    nextoutfname = dir_file_cat(outfname,
-						ournames[i]->filename);
-		else
-		    nextoutfname = dupstr(ournames[i]->filename);
+                nextoutfname = dir_file_cat(outfname, ournames[i]->filename);
 		ret = sftp_get_file(nextfname, nextoutfname, recurse, restart);
 		restart = FALSE;       /* after first partial file, do full */
 		sfree(nextoutfname);
@@ -469,6 +468,8 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
 		printf("error while reading: %s\n", fxp_error());
 		shown_err = TRUE;
 	    }
+            if (ret == INT_MIN)        /* pktin not even freed */
+                sfree(pktin);
             ret = 0;
 	}
 
@@ -577,7 +578,8 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
 	 * same directory, just in case two readdirs on the same
 	 * local directory return a different order.
 	 */
-	qsort(ournames, nnames, sizeof(*ournames), bare_name_compare);
+        if (nnames > 0)
+            qsort(ournames, nnames, sizeof(*ournames), bare_name_compare);
 
 	/*
 	 * If we're in restart mode, find the last filename on this
@@ -614,10 +616,7 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
 	    char *nextfname, *nextoutfname;
 	    int ret;
 
-	    if (fname)
-		nextfname = dir_file_cat(fname, ournames[i]);
-	    else
-		nextfname = dupstr(ournames[i]);
+            nextfname = dir_file_cat(fname, ournames[i]);
 	    nextoutfname = dupcat(outfname, "/", ournames[i], NULL);
 	    ret = sftp_put_file(nextfname, nextoutfname, recurse, restart);
 	    restart = FALSE;	       /* after first partial file, do full */
@@ -669,21 +668,19 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
     if (restart) {
 	char decbuf[30];
 	struct fxp_attrs attrs;
-	int ret;
 
 	req = fxp_fstat_send(fh);
         pktin = sftp_wait_for_reply(req);
 	ret = fxp_fstat_recv(pktin, req, &attrs);
 
 	if (!ret) {
-	    close_rfile(file);
 	    printf("read size of %s: %s\n", outfname, fxp_error());
-	    return 0;
+            goto cleanup;
 	}
 	if (!(attrs.flags & SSH_FILEXFER_ATTR_SIZE)) {
-	    close_rfile(file);
 	    printf("read size of %s: size was not given\n", outfname);
-	    return 0;
+            ret = 0;
+            goto cleanup;
 	}
 	offset = attrs.size;
 	uint64_decimal(offset, decbuf);
@@ -723,15 +720,20 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
 	if (!xfer_done(xfer)) {
 	    pktin = sftp_recv();
 	    ret = xfer_upload_gotpkt(xfer, pktin);
-	    if (ret <= 0 && !err) {
-		printf("error while writing: %s\n", fxp_error());
-		err = 1;
+	    if (ret <= 0) {
+                if (ret == INT_MIN)        /* pktin not even freed */
+                    sfree(pktin);
+                if (!err) {
+                    printf("error while writing: %s\n", fxp_error());
+                    err = 1;
+                }
 	    }
 	}
     }
 
     xfer_cleanup(xfer);
 
+  cleanup:
     req = fxp_close_send(fh);
     pktin = sftp_wait_for_reply(req);
     fxp_close_recv(pktin, req);
@@ -919,6 +921,7 @@ int wildcard_iterate(char *filename, int (*func)(void *, char *), void *ctx)
 		printf("%s: canonify: %s\n", newname, fxp_error());
 		ret = 0;
 	    }
+            sfree(newname);
 	    matched = TRUE;
 	    ret &= func(ctx, cname);
 	    sfree(cname);
@@ -1031,6 +1034,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 	char *tmpdir;
 	int len, check;
 
+        sfree(unwcdir);
 	wildcard = stripslashes(dir, 0);
 	unwcdir = dupstr(dir);
 	len = wildcard - dir;
@@ -1103,7 +1107,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 	 * Now we have our filenames. Sort them by actual file
 	 * name, and then output the longname parts.
 	 */
-	qsort(ournames, nnames, sizeof(*ournames), sftp_name_compare);
+        if (nnames > 0)
+            qsort(ournames, nnames, sizeof(*ournames), sftp_name_compare);
 
 	/*
 	 * And print them.
@@ -1252,7 +1257,9 @@ int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
 	    fname = canonify(origwfname);
 
 	    if (!fname) {
+                sftp_finish_wildcard_matching(swcm);
 		printf("%s: canonify: %s\n", origwfname, fxp_error());
+		sfree(origwfname);
 		sfree(unwcfname);
 		return 0;
 	    }
@@ -2228,6 +2235,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 	cmd->obey = sftp_cmd_quit;
 	if ((mode == 0) || (modeflags & 1))
 	    printf("quit\n");
+        sfree(line);
 	return cmd;		       /* eof */
     }
 
@@ -2470,6 +2478,18 @@ void modalfatalbox(char *fmt, ...)
 
     cleanup_exit(1);
 }
+void nonfatal(char *fmt, ...)
+{
+    char *str, *str2;
+    va_list ap;
+    va_start(ap, fmt);
+    str = dupvprintf(fmt, ap);
+    str2 = dupcat("Error: ", str, "\n", NULL);
+    sfree(str);
+    va_end(ap);
+    fputs(str2, stderr);
+    sfree(str2);
+}
 void connection_fatal(void *frontend, char *fmt, ...)
 {
     char *str, *str2;
@@ -2647,9 +2667,11 @@ static void usage(void)
     printf("  -1 -2     force use of particular SSH protocol version\n");
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
-    printf("  -i key    private key file for authentication\n");
+    printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -hostkey aa:bb:cc:...\n");
+    printf("            manually specify a host key (may be repeated)\n");
     printf("  -batch    disable all interactive prompts\n");
     cleanup_exit(1);
 }
@@ -2701,6 +2723,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 	    /* Use `host' as a bare hostname. */
 	    conf_set_str(conf, CONF_host, host);
 	}
+        conf_free(conf2);
     } else {
 	/* Patch in hostname `host' to session details. */
 	conf_set_str(conf, CONF_host, host);
@@ -2863,6 +2886,9 @@ void cmdline_error(char *p, ...)
     exit(1);
 }
 
+const int share_can_be_downstream = TRUE;
+const int share_can_be_upstream = FALSE;
+
 /*
  * Main program. Parse arguments etc.
  */