};
RFile *open_existing_file(char *name, uint64 *size,
- unsigned long *mtime, unsigned long *atime)
+ unsigned long *mtime, unsigned long *atime,
+ long *perms)
{
HANDLE h;
RFile *ret;
TIME_WIN_TO_POSIX(wrtime, *mtime);
}
+ if (perms)
+ *perms = -1;
+
return ret;
}
HANDLE h;
};
-WFile *open_new_file(char *name)
+WFile *open_new_file(char *name, long perms)
{
HANDLE h;
WFile *ret;
int do_eventsel_loop(HANDLE other_event)
{
int n, nhandles, nallhandles, netindex, otherindex;
- long next, ticks;
+ unsigned long next, then;
+ long ticks;
HANDLE *handles;
SOCKET *sklist;
int skcount;
- long now = GETTICKCOUNT();
+ unsigned long now = GETTICKCOUNT();
if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks < 0) ticks = 0; /* just in case */
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
} else {
ticks = INFINITE;
}
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 */
select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);
do {
- long next, ticks;
+ unsigned long next;
+ long ticks;
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;