X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Fposix.c;h=00f03355985077c08665a79e5036b60755507e40;hp=eae8c86170b958254bd8a2bc14c7015f801ac8d7;hb=13a85be93769986e03662e8dae6f8bfdf2971aa9;hpb=820d983868e6ec4ced6e7eef6c2d571239afe02b diff --git a/os/windows/posix.c b/os/windows/posix.c index eae8c861..00f03355 100755 --- a/os/windows/posix.c +++ b/os/windows/posix.c @@ -25,8 +25,8 @@ #include "../os-windows.h" #include "../../lib/hweight.h" -extern unsigned long mtime_since_now(struct timeval *); -extern void fio_gettime(struct timeval *, void *); +extern unsigned long mtime_since_now(struct timespec *); +extern void fio_gettime(struct timespec *, void *); /* These aren't defined in the MinGW headers */ HRESULT WINAPI StringCchCopyA( @@ -584,7 +584,8 @@ char *basename(char *path) while (path[i] != '\\' && path[i] != '/' && i >= 0) i--; - strncpy(name, path + i + 1, MAX_PATH); + name[MAX_PATH - 1] = '\0'; + strncpy(name, path + i + 1, MAX_PATH - 1); return name; } @@ -852,7 +853,7 @@ int poll(struct pollfd fds[], nfds_t nfds, int timeout) int nanosleep(const struct timespec *rqtp, struct timespec *rmtp) { - struct timeval tv; + struct timespec tv; DWORD ms_remaining; DWORD ms_total = (rqtp->tv_sec * 1000) + (rqtp->tv_nsec / 1000000.0);