projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The xfer mechanism wasn't gracefully terminating when an error was
[u/mdw/putty]
/
psftp.c
diff --git
a/psftp.c
b/psftp.c
index
7bc556e
..
0eedf9d
100644
(file)
--- a/
psftp.c
+++ b/
psftp.c
@@
-201,7
+201,7
@@
int sftp_get_file(char *fname, char *outfname, int recurse, int restart,
struct fxp_xfer *xfer;
uint64 offset;
FILE *fp;
struct fxp_xfer *xfer;
uint64 offset;
FILE *fp;
- int ret;
+ int ret
, shown_err = FALSE
;
/*
* In recursive mode, see if we're dealing with a directory.
/*
* In recursive mode, see if we're dealing with a directory.
@@
-443,7
+443,10
@@
int sftp_get_file(char *fname, char *outfname, int recurse, int restart,
ret = xfer_download_gotpkt(xfer, pktin);
if (ret < 0) {
ret = xfer_download_gotpkt(xfer, pktin);
if (ret < 0) {
- printf("error while reading: %s\n", fxp_error());
+ if (!shown_err) {
+ printf("error while reading: %s\n", fxp_error());
+ shown_err = TRUE;
+ }
ret = 0;
}
ret = 0;
}