nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-23 15:09:24 -05:00
Code Issues Projects Releases Wiki Activity

Replicate r8110 from PSFTP to PSCP, and various other minor patchery from

Browse Source 
Roger Picton.

[originally from svn r8117]
[r8110 == e01df1da9f41aa7554e99708c117241c59fcef3d]
This commit is contained in:
Jacob Nevins 2008-07-11 19:24:56 +00:00
parent e01df1da9f
commit a071dfdcd2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pscp.c
View File

@ -252,9 +252,15 @@ static int ssh_scp_recv(unsigned char *buf, int len)
static void ssh_scp_init(void) static void ssh_scp_init(void)
{ {
while (!back->sendok(backhandle)) { while (!back->sendok(backhandle)) {
if (ssh_sftp_loop_iteration() < 0) if (back->exitcode(backhandle) >= 0) {
errs++;
return;
}
if (ssh_sftp_loop_iteration() < 0) {
errs++;
return; /* doom */ return; /* doom */
} }
}
/* Work out which backend we ended up using. */ /* Work out which backend we ended up using. */
if (!ssh_fallback_cmd(backhandle)) if (!ssh_fallback_cmd(backhandle))
@ -467,7 +473,7 @@ static void do_cmd(char *host, char *user, char *cmd)
back->provide_logctx(backhandle, logctx); back->provide_logctx(backhandle, logctx);
console_provide_logctx(logctx); console_provide_logctx(logctx);
ssh_scp_init(); ssh_scp_init();
if (verbose && realhost != NULL) if (verbose && realhost != NULL && errs == 0)
tell_user(stderr, "Connected to %s\n", realhost); tell_user(stderr, "Connected to %s\n", realhost);
sfree(realhost); sfree(realhost);
} }