nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00
Code Issues Projects Releases Wiki Activity

Misc bugfixes

Browse Source 
[originally from svn r771]
This commit is contained in:
Simon Tatham 2000-10-27 09:17:19 +00:00
parent eab981fbd1
commit 2c9c817895
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scp.c
View File

@ -53,7 +53,6 @@ static int statistics = 1;
static int portnumber = 0; static int portnumber = 0;
static char *password = NULL; static char *password = NULL;
static int errs = 0; static int errs = 0;
static int connection_open = 0;
/* GUI Adaptation - Sept 2000 */ /* GUI Adaptation - Sept 2000 */
#define NAME_STR_MAX 2048 #define NAME_STR_MAX 2048
static char statname[NAME_STR_MAX+1]; static char statname[NAME_STR_MAX+1];
@ -377,7 +376,7 @@ static void bump(char *fmt, ...)
strcat(str, "\n"); strcat(str, "\n");
tell_str(stderr, str); tell_str(stderr, str);
if (connection_open) { if (back->socket() != NULL) {
char ch; char ch;
back->special(TS_EOF); back->special(TS_EOF);
ssh_scp_recv(&ch, 1); ssh_scp_recv(&ch, 1);
@ -476,8 +475,6 @@ static void do_cmd(char *host, char *user, char *cmd)
ssh_scp_init(); ssh_scp_init();
if (verbose && realhost != NULL) if (verbose && realhost != NULL)
tell_user(stderr, "Connected to %s\n", realhost); tell_user(stderr, "Connected to %s\n", realhost);
connection_open = 1;
} }
/* /*
@ -1235,7 +1232,7 @@ int main(int argc, char *argv[])
tolocal(argc, argv); tolocal(argc, argv);
} }
if (connection_open) { if (back->socket() != NULL) {
char ch; char ch;
back->special(TS_EOF); back->special(TS_EOF);
ssh_scp_recv(&ch, 1); ssh_scp_recv(&ch, 1);

2
ssh.c
View File

@ -998,7 +998,7 @@ static void ssh_gotdata(unsigned char *data, int datalen)
crFinishV; crFinishV;
} }
static int ssh_receive(Socket s, int urgent, char *data, int len) { static int ssh_receive(Socket skt, int urgent, char *data, int len) {
if (!len) { if (!len) {
/* Connection has closed. */ /* Connection has closed. */
sk_close(s); sk_close(s);