Skip to content

Commit 097cd8d

Browse files
dschodscho
committed
Merge pull request #443 from kblees/kb/nanosecond-file-times-v2.5.3
nanosecond file times for v2.5.3
2 parents 4876911 + 42bb976 commit 097cd8d

File tree

3 files changed

+76
-38
lines changed

3 files changed

+76
-38
lines changed

‎compat/mingw.c

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -648,9 +648,11 @@ static inline long long filetime_to_hnsec(const FILETIME *ft)
648648
return winTime - 116444736000000000LL;
649649
}
650650

651-
static inline time_t filetime_to_time_t(const FILETIME *ft)
651+
static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
652652
{
653-
return (time_t)(filetime_to_hnsec(ft) / 10000000);
653+
long long hnsec = filetime_to_hnsec(ft);
654+
ts->tv_sec = (time_t)(hnsec / 10000000);
655+
ts->tv_nsec = (hnsec % 10000000) * 100;
654656
}
655657

656658
/**
@@ -709,9 +711,9 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
709711
buf->st_size = fdata.nFileSizeLow |
710712
(((off_t)fdata.nFileSizeHigh)<<32);
711713
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
712-
buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
713-
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
714-
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
714+
filetime_to_timespec(&(fdata.ftLastAccessTime), &(buf->st_atim));
715+
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
716+
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
715717
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
716718
WIN32_FIND_DATAW findbuf;
717719
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
@@ -792,6 +794,29 @@ static int do_stat_internal(int follow, const char *file_name, struct stat *buf)
792794
return do_lstat(follow, alt_name, buf);
793795
}
794796

797+
static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
798+
{
799+
BY_HANDLE_FILE_INFORMATION fdata;
800+
801+
if (!GetFileInformationByHandle(hnd, &fdata)) {
802+
errno = err_win_to_posix(GetLastError());
803+
return -1;
804+
}
805+
806+
buf->st_ino = 0;
807+
buf->st_gid = 0;
808+
buf->st_uid = 0;
809+
buf->st_nlink = 1;
810+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
811+
buf->st_size = fdata.nFileSizeLow |
812+
(((off_t)fdata.nFileSizeHigh)<<32);
813+
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
814+
filetime_to_timespec(&(fdata.ftLastAccessTime), &(buf->st_atim));
815+
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
816+
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
817+
return 0;
818+
}
819+
795820
int mingw_lstat(const char *file_name, struct stat *buf)
796821
{
797822
return do_stat_internal(0, file_name, buf);
@@ -804,32 +829,31 @@ int mingw_stat(const char *file_name, struct stat *buf)
804829
int mingw_fstat(int fd, struct stat *buf)
805830
{
806831
HANDLE fh = (HANDLE)_get_osfhandle(fd);
807-
BY_HANDLE_FILE_INFORMATION fdata;
832+
DWORD avail, type = GetFileType(fh) & ~FILE_TYPE_REMOTE;
808833

809-
if (fh == INVALID_HANDLE_VALUE) {
810-
errno = EBADF;
811-
return -1;
812-
}
813-
/* direct non-file handles to MS's fstat() */
814-
if (GetFileType(fh) != FILE_TYPE_DISK)
815-
return _fstati64(fd, buf);
834+
switch (type) {
835+
case FILE_TYPE_DISK:
836+
return get_file_info_by_handle(fh, buf);
816837

817-
if (GetFileInformationByHandle(fh, &fdata)) {
818-
buf->st_ino = 0;
819-
buf->st_gid = 0;
820-
buf->st_uid = 0;
838+
case FILE_TYPE_CHAR:
839+
case FILE_TYPE_PIPE:
840+
/* initialize stat fields */
841+
memset(buf, 0, sizeof(*buf));
821842
buf->st_nlink = 1;
822-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
823-
buf->st_size = fdata.nFileSizeLow |
824-
(((off_t)fdata.nFileSizeHigh)<<32);
825-
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
826-
buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
827-
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
828-
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
843+
844+
if (type == FILE_TYPE_CHAR) {
845+
buf->st_mode = _S_IFCHR;
846+
} else {
847+
buf->st_mode = _S_IFIFO;
848+
if (PeekNamedPipe(fh, NULL, 0, NULL, &avail, NULL))
849+
buf->st_size = avail;
850+
}
829851
return 0;
852+
853+
default:
854+
errno = EBADF;
855+
return -1;
830856
}
831-
errno = EBADF;
832-
return -1;
833857
}
834858

835859
static inline void time_t_to_filetime(time_t t, FILETIME *ft)

‎compat/mingw.h

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -354,18 +354,41 @@ static inline int getrlimit(int resource, struct rlimit *rlp)
354354
}
355355

356356
/*
357-
* Use mingw specific stat()/lstat()/fstat() implementations on Windows.
357+
* Use mingw specific stat()/lstat()/fstat() implementations on Windows,
358+
* including our own struct stat with 64 bit st_size and nanosecond-precision
359+
* file times.
358360
*/
359361
#ifndef __MINGW64_VERSION_MAJOR
360362
#define off_t off64_t
361363
#define lseek _lseeki64
364+
struct timespec {
365+
time_t tv_sec;
366+
long tv_nsec;
367+
};
362368
#endif
363369

364-
/* use struct stat with 64 bit st_size */
370+
struct mingw_stat {
371+
_dev_t st_dev;
372+
_ino_t st_ino;
373+
_mode_t st_mode;
374+
short st_nlink;
375+
short st_uid;
376+
short st_gid;
377+
_dev_t st_rdev;
378+
off64_t st_size;
379+
struct timespec st_atim;
380+
struct timespec st_mtim;
381+
struct timespec st_ctim;
382+
};
383+
384+
#define st_atime st_atim.tv_sec
385+
#define st_mtime st_mtim.tv_sec
386+
#define st_ctime st_ctim.tv_sec
387+
365388
#ifdef stat
366389
#undef stat
367390
#endif
368-
#define stat _stati64
391+
#define stat mingw_stat
369392
int mingw_lstat(const char *file_name, struct stat *buf);
370393
int mingw_stat(const char *file_name, struct stat *buf);
371394
int mingw_fstat(int fd, struct stat *buf);
@@ -378,13 +401,6 @@ int mingw_fstat(int fd, struct stat *buf);
378401
#endif
379402
#define lstat mingw_lstat
380403

381-
#ifndef _stati64
382-
# define _stati64(x,y) mingw_stat(x,y)
383-
#elif defined (_USE_32BIT_TIME_T)
384-
# define _stat32i64(x,y) mingw_stat(x,y)
385-
#else
386-
# define _stat64(x,y) mingw_stat(x,y)
387-
#endif
388404

389405
int mingw_utime(const char *file_name, const struct utimbuf *times);
390406
#define utime mingw_utime

‎config.mak.uname

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ ifeq ($(uname_S),Windows)
370370
RUNTIME_PREFIX = YesPlease
371371
HAVE_WPGMPTR = YesWeDo
372372
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
373-
NO_NSEC = YesPlease
374373
USE_WIN32_MMAP = YesPlease
375374
MMAP_PREVENTS_DELETE = UnfortunatelyYes
376375
# USE_NED_ALLOCATOR = YesPlease
@@ -518,7 +517,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
518517
RUNTIME_PREFIX = YesPlease
519518
HAVE_WPGMPTR = YesWeDo
520519
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
521-
NO_NSEC = YesPlease
522520
USE_WIN32_MMAP = YesPlease
523521
MMAP_PREVENTS_DELETE = UnfortunatelyYes
524522
USE_NED_ALLOCATOR = YesPlease

0 commit comments

Comments
 (0)