Commit c4d23928 by Edward Thomson

fstat: use our custom `stat`

parent aadad405
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
typedef SOCKET GIT_SOCKET; typedef SOCKET GIT_SOCKET;
#define p_lseek(f,n,w) _lseeki64(f, n, w) #define p_lseek(f,n,w) _lseeki64(f, n, w)
#define p_fstat(f,b) _fstat64(f, b)
extern int p_fstat(int fd, struct stat *buf);
extern int p_lstat(const char *file_name, struct stat *buf); extern int p_lstat(const char *file_name, struct stat *buf);
extern int p_stat(const char* path, struct stat* buf); extern int p_stat(const char* path, struct stat *buf);
extern int p_utimes(const char *filename, const struct p_timeval times[2]); extern int p_utimes(const char *filename, const struct p_timeval times[2]);
extern int p_futimes(int fd, const struct p_timeval times[2]); extern int p_futimes(int fd, const struct p_timeval times[2]);
......
...@@ -398,6 +398,22 @@ static int follow_and_lstat_link(git_win32_path path, struct stat* buf) ...@@ -398,6 +398,22 @@ static int follow_and_lstat_link(git_win32_path path, struct stat* buf)
return lstat_w(target_w, buf, false); return lstat_w(target_w, buf, false);
} }
int p_fstat(int fd, struct stat *buf)
{
BY_HANDLE_FILE_INFORMATION fhInfo;
HANDLE fh = (HANDLE)_get_osfhandle(fd);
if (fh == INVALID_HANDLE_VALUE ||
!GetFileInformationByHandle(fh, &fhInfo)) {
errno = EBADF;
return -1;
}
git_win32__file_information_to_stat(buf, &fhInfo);
return 0;
}
int p_stat(const char* path, struct stat* buf) int p_stat(const char* path, struct stat* buf)
{ {
git_win32_path path_w; git_win32_path path_w;
......
...@@ -105,19 +105,25 @@ GIT_INLINE(void) git_win32__timeval_to_filetime( ...@@ -105,19 +105,25 @@ GIT_INLINE(void) git_win32__timeval_to_filetime(
ft->dwLowDateTime = (ticks & 0xffffffffLL); ft->dwLowDateTime = (ticks & 0xffffffffLL);
} }
GIT_INLINE(int) git_win32__file_attribute_to_stat( GIT_INLINE(void) git_win32__stat_init(
struct stat *st, struct stat *st,
const WIN32_FILE_ATTRIBUTE_DATA *attrdata, DWORD dwFileAttributes,
const wchar_t *path) DWORD nFileSizeHigh,
DWORD nFileSizeLow,
FILETIME ftCreationTime,
FILETIME ftLastAccessTime,
FILETIME ftLastWriteTime)
{ {
mode_t mode = S_IREAD; mode_t mode = S_IREAD;
if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) memset(st, 0, sizeof(struct stat));
if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
mode |= S_IFDIR; mode |= S_IFDIR;
else else
mode |= S_IFREG; mode |= S_IFREG;
if ((attrdata->dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0) if ((dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0)
mode |= S_IWRITE; mode |= S_IWRITE;
st->st_ino = 0; st->st_ino = 0;
...@@ -125,12 +131,39 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat( ...@@ -125,12 +131,39 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat(
st->st_uid = 0; st->st_uid = 0;
st->st_nlink = 1; st->st_nlink = 1;
st->st_mode = mode; st->st_mode = mode;
st->st_size = ((git_off_t)attrdata->nFileSizeHigh << 32) + attrdata->nFileSizeLow; st->st_size = ((git_off_t)nFileSizeHigh << 32) + nFileSizeLow;
st->st_dev = _getdrive() - 1; st->st_dev = _getdrive() - 1;
st->st_rdev = st->st_dev; st->st_rdev = st->st_dev;
git_win32__filetime_to_timespec(&(attrdata->ftLastAccessTime), &(st->st_atim)); git_win32__filetime_to_timespec(&ftLastAccessTime, &(st->st_atim));
git_win32__filetime_to_timespec(&(attrdata->ftLastWriteTime), &(st->st_mtim)); git_win32__filetime_to_timespec(&ftLastWriteTime, &(st->st_mtim));
git_win32__filetime_to_timespec(&(attrdata->ftCreationTime), &(st->st_ctim)); git_win32__filetime_to_timespec(&ftCreationTime, &(st->st_ctim));
}
GIT_INLINE(void) git_win32__file_information_to_stat(
struct stat *st,
const BY_HANDLE_FILE_INFORMATION *fileinfo)
{
git_win32__stat_init(st,
fileinfo->dwFileAttributes,
fileinfo->nFileSizeHigh,
fileinfo->nFileSizeLow,
fileinfo->ftCreationTime,
fileinfo->ftLastAccessTime,
fileinfo->ftLastWriteTime);
}
GIT_INLINE(int) git_win32__file_attribute_to_stat(
struct stat *st,
const WIN32_FILE_ATTRIBUTE_DATA *attrdata,
const wchar_t *path)
{
git_win32__stat_init(st,
attrdata->dwFileAttributes,
attrdata->nFileSizeHigh,
attrdata->nFileSizeLow,
attrdata->ftCreationTime,
attrdata->ftLastAccessTime,
attrdata->ftLastWriteTime);
if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && path) { if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && path) {
git_win32_path target; git_win32_path target;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment