From 1d7afb271f1ad6411de72d024fa077c74122a91c Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Tue, 10 Jan 2017 23:21:56 +0100
Subject: [PATCH] mingw: teach fscache and dirent about symlinks
Move S_IFLNK detection to file_attr_to_st_mode() and reuse it in fscache.
Implement DT_LNK detection in dirent.c and the fscache readdir version.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
compat/mingw.c | 13 +++----------
compat/win32.h | 6 ++++--
compat/win32/dirent.c | 5 ++++-
compat/win32/fscache.c | 11 +++++++----
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index d4aad9d49eb60d..4194eb77e641b6 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -961,21 +961,14 @@ int mingw_lstat(const char *file_name, struct stat *buf)
buf->st_gid = 0;
buf->st_uid = 0;
buf->st_nlink = 1;
- buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
+ buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
+ findbuf.dwReserved0);
buf->st_size = fdata.nFileSizeLow |
(((off_t)fdata.nFileSizeHigh)<<32);
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
filetime_to_timespec(&(fdata.ftLastAccessTime), &(buf->st_atim));
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
- if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
- if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
- (findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
- buf->st_mode = S_IFLNK | S_IREAD;
- if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
- buf->st_mode |= S_IWRITE;
- }
- }
return 0;
}
error:
@@ -1020,7 +1013,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
buf->st_gid = 0;
buf->st_uid = 0;
buf->st_nlink = 1;
- buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
+ buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
buf->st_size = fdata.nFileSizeLow |
(((off_t)fdata.nFileSizeHigh)<<32);
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
diff --git a/compat/win32.h b/compat/win32.h
index a97e880757b6f1..671bcc81f93351 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -6,10 +6,12 @@
#include <windows.h>
#endif
-static inline int file_attr_to_st_mode (DWORD attr)
+static inline int file_attr_to_st_mode (DWORD attr, DWORD tag)
{
int fMode = S_IREAD;
- if (attr & FILE_ATTRIBUTE_DIRECTORY)
+ if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
+ fMode |= S_IFLNK;
+ else if (attr & FILE_ATTRIBUTE_DIRECTORY)
fMode |= S_IFDIR;
else
fMode |= S_IFREG;
diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c
index c9fe2454efc01c..87063101f57202 100644
--- a/compat/win32/dirent.c
+++ b/compat/win32/dirent.c
@@ -18,7 +18,10 @@ static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
xwcstoutf(ent->d_name, fdata->cFileName, MAX_PATH * 3);
/* Set file type, based on WIN32_FIND_DATA */
- if (fdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ if ((fdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+ && fdata->dwReserved0 == IO_REPARSE_TAG_SYMLINK)
+ ent->d_type = DT_LNK;
+ else if (fdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
ent->d_type = DT_DIR;
else
ent->d_type = DT_REG;
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
index d5a5e9b006022e..c94b8631e219a0 100644
--- a/compat/win32/fscache.c
+++ b/compat/win32/fscache.c
@@ -202,10 +202,13 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
fdata->EaSize : 0;
- fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes);
- fse->dirent.d_type = S_ISDIR(fse->st_mode) ? DT_DIR : DT_REG;
- fse->u.s.st_size = fdata->EndOfFile.LowPart |
- (((off_t)fdata->EndOfFile.HighPart) << 32);
+ fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes,
+ fdata->EaSize);
+ fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
+ S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
+ fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_LONG_PATH :
+ fdata->EndOfFile.LowPart |
+ (((off_t)fdata->EndOfFile.HighPart) << 32);
filetime_to_timespec((FILETIME *)&(fdata->LastAccessTime),
&(fse->u.s.st_atim));
filetime_to_timespec((FILETIME *)&(fdata->LastWriteTime),