projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5080 didn't go far enough -- since 0.58, anyone on Unix who didn't previously
[u/mdw/putty]
/
pscp.c
diff --git
a/pscp.c
b/pscp.c
index
e208157
..
3ef1b33
100644
(file)
--- a/
pscp.c
+++ b/
pscp.c
@@
-252,8
+252,14
@@
static int ssh_scp_recv(unsigned char *buf, int len)
static void ssh_scp_init(void)
{
while (!back->sendok(backhandle)) {
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 */
return; /* doom */
+ }
}
/* Work out which backend we ended up using. */
}
/* Work out which backend we ended up using. */
@@
-418,6
+424,7
@@
static void do_cmd(char *host, char *user, char *cmd)
cfg.x11_forward = 0;
cfg.agentfwd = 0;
cfg.portfwd[0] = cfg.portfwd[1] = '\0';
cfg.x11_forward = 0;
cfg.agentfwd = 0;
cfg.portfwd[0] = cfg.portfwd[1] = '\0';
+ cfg.ssh_simple = TRUE;
/*
* Set up main and possibly fallback command depending on
/*
* Set up main and possibly fallback command depending on
@@
-466,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();
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);
}
tell_user(stderr, "Connected to %s\n", realhost);
sfree(realhost);
}