one of them. Correct that.
git-svn-id: http://svn.tartarus.org/sgt/putty@9676
cda61777-01e9-0310-a592-
d414129be87e
if (p_WSAEventSelect == NULL) {
fd_set readfds;
int ret;
if (p_WSAEventSelect == NULL) {
fd_set readfds;
int ret;
- long now = GETTICKCOUNT();
+ unsigned long now = GETTICKCOUNT(), then;
if (sftp_ssh_socket == INVALID_SOCKET)
return -1; /* doom */
if (sftp_ssh_socket == INVALID_SOCKET)
return -1; /* doom */
select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);
do {
select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);
do {
+ unsigned long next;
+ long ticks;
struct timeval tv, *ptv;
if (run_timers(now, &next)) {
struct timeval tv, *ptv;
if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks <= 0)
- ticks = 1; /* just in case */
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
tv.tv_sec = ticks / 1000;
tv.tv_usec = ticks % 1000 * 1000;
ptv = &tv;
tv.tv_sec = ticks / 1000;
tv.tv_usec = ticks % 1000 * 1000;
ptv = &tv;