mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-22 14:39:24 -05:00
Replicate r8110 from PSFTP to PSCP, and various other minor patchery from
Roger Picton. [originally from svn r8117] [r8110 == e01df1da9f41aa7554e99708c117241c59fcef3d]
This commit is contained in:
parent
e01df1da9f
commit
a071dfdcd2
10
pscp.c
10
pscp.c
@ -252,9 +252,15 @@ static int ssh_scp_recv(unsigned char *buf, int len)
|
||||
static void ssh_scp_init(void)
|
||||
{
|
||||
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 */
|
||||
}
|
||||
}
|
||||
|
||||
/* Work out which backend we ended up using. */
|
||||
if (!ssh_fallback_cmd(backhandle))
|
||||
@ -467,7 +473,7 @@ static void do_cmd(char *host, char *user, char *cmd)
|
||||
back->provide_logctx(backhandle, logctx);
|
||||
console_provide_logctx(logctx);
|
||||
ssh_scp_init();
|
||||
if (verbose && realhost != NULL)
|
||||
if (verbose && realhost != NULL && errs == 0)
|
||||
tell_user(stderr, "Connected to %s\n", realhost);
|
||||
sfree(realhost);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user