projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new bug-compatibility mode that limits the window size we'll
[u/mdw/putty]
/
pscp.c
diff --git
a/pscp.c
b/pscp.c
index
5f22828
..
1809c6f
100644
(file)
--- a/
pscp.c
+++ b/
pscp.c
@@
-180,12
+180,6
@@
int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
return 0;
}
return 0;
}
- /*
- * If this is before the real session begins, just return.
- */
- if (!outptr)
- return 0;
-
if ((outlen > 0) && (len > 0)) {
unsigned used = outlen;
if (used > len)
if ((outlen > 0) && (len > 0)) {
unsigned used = outlen;
if (used > len)
@@
-292,7
+286,7
@@
static void bump(char *fmt, ...)
sfree(str2);
errs++;
sfree(str2);
errs++;
- if (back != NULL && back->
socket(backhandle) != NULL
) {
+ if (back != NULL && back->
connected(backhandle)
) {
char ch;
back->special(backhandle, TS_EOF);
ssh_scp_recv((unsigned char *) &ch, 1);
char ch;
back->special(backhandle, TS_EOF);
ssh_scp_recv((unsigned char *) &ch, 1);
@@
-424,6
+418,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
@@
-2285,7
+2280,7
@@
int psftp_main(int argc, char *argv[])
tolocal(argc, argv);
}
tolocal(argc, argv);
}
- if (back != NULL && back->
socket(backhandle) != NULL
) {
+ if (back != NULL && back->
connected(backhandle)
) {
char ch;
back->special(backhandle, TS_EOF);
ssh_scp_recv((unsigned char *) &ch, 1);
char ch;
back->special(backhandle, TS_EOF);
ssh_scp_recv((unsigned char *) &ch, 1);