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

Don't quit the plink main loop until the stdout and stderr buffers

Browse Source 
are empty.

[originally from svn r1313]
This commit is contained in:
Simon Tatham 2001-10-23 19:22:01 +00:00
parent 05226e43a9
commit f9bbdc1226
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plink.c
View File

@ -787,10 +787,12 @@ int main(int argc, char **argv)
} else if (n == 1) { } else if (n == 1) {
reading = 0; reading = 0;
noise_ultralight(idata.len); noise_ultralight(idata.len);
if (idata.len > 0) { if (connopen && back->socket() != NULL) {
back->send(idata.buffer, idata.len); if (idata.len > 0) {
} else { back->send(idata.buffer, idata.len);
back->special(TS_EOF); } else {
back->special(TS_EOF);
}
} }
} else if (n == 2) { } else if (n == 2) {
odata.busy = 0; odata.busy = 0;
@ -801,8 +803,10 @@ int main(int argc, char **argv)
bufchain_consume(&stdout_data, odata.lenwritten); bufchain_consume(&stdout_data, odata.lenwritten);
if (bufchain_size(&stdout_data) > 0) if (bufchain_size(&stdout_data) > 0)
try_output(0); try_output(0);
back->unthrottle(bufchain_size(&stdout_data) + if (connopen && back->socket() != NULL) {
bufchain_size(&stderr_data)); back->unthrottle(bufchain_size(&stdout_data) +
bufchain_size(&stderr_data));
}
} else if (n == 3) { } else if (n == 3) {
edata.busy = 0; edata.busy = 0;
if (!edata.writeret) { if (!edata.writeret) {
@ -812,14 +816,18 @@ int main(int argc, char **argv)
bufchain_consume(&stderr_data, edata.lenwritten); bufchain_consume(&stderr_data, edata.lenwritten);
if (bufchain_size(&stderr_data) > 0) if (bufchain_size(&stderr_data) > 0)
try_output(1); try_output(1);
back->unthrottle(bufchain_size(&stdout_data) + if (connopen && back->socket() != NULL) {
bufchain_size(&stderr_data)); back->unthrottle(bufchain_size(&stdout_data) +
bufchain_size(&stderr_data));
}
} }
if (!reading && back->sendbuffer() < MAX_STDIN_BACKLOG) { if (!reading && back->sendbuffer() < MAX_STDIN_BACKLOG) {
SetEvent(idata.eventback); SetEvent(idata.eventback);
reading = 1; reading = 1;
} }
if (!connopen || back->socket() == NULL) if ((!connopen || back->socket() == NULL) &&
bufchain_size(&stdout_data) == 0 &&
bufchain_size(&stderr_data) == 0)
break; /* we closed the connection */ break; /* we closed the connection */
} }
WSACleanup(); WSACleanup();