Skip to content

Commit 83e8f54

Browse files
committed
mingw: Windows Docker volumes are *not* symbolic links
... even if they may look like them. As looking up the target of the "symbolic link" (just to see whether it starts with `/ContainerMappedDirectories/`) is pretty expensive, we do it when we can be *really* sure that there is a possibility that this might be the case. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: JiSeop Moon <[email protected]>
1 parent 96423c5 commit 83e8f54

File tree

3 files changed

+43
-8
lines changed

3 files changed

+43
-8
lines changed

compat/mingw.c

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
909909
buf->st_uid = 0;
910910
buf->st_nlink = 1;
911911
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
912-
findbuf.dwReserved0);
912+
findbuf.dwReserved0, file_name);
913913
buf->st_size = S_ISLNK(buf->st_mode) ? MAX_LONG_PATH :
914914
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
915915
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -960,7 +960,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
960960
buf->st_gid = 0;
961961
buf->st_uid = 0;
962962
buf->st_nlink = 1;
963-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
963+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
964964
buf->st_size = fdata.nFileSizeLow |
965965
(((off_t)fdata.nFileSizeHigh)<<32);
966966
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3181,12 +3181,25 @@ int is_inside_windows_container(void)
31813181
return inside_container;
31823182
}
31833183

3184-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3184+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
31853185
{
31863186
int fMode = S_IREAD;
3187-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3188-
fMode |= S_IFLNK;
3189-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3187+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3188+
tag == IO_REPARSE_TAG_SYMLINK) {
3189+
int flag = S_IFLNK;
3190+
char buf[MAX_LONG_PATH];
3191+
3192+
/*
3193+
* Windows containers' mapped volumes are marked as reparse
3194+
* points and look like symbolic links, but they are not.
3195+
*/
3196+
if (path && is_inside_windows_container() &&
3197+
readlink(path, buf, sizeof(buf)) > 27 &&
3198+
starts_with(buf, "/ContainerMappedDirectories/"))
3199+
flag = S_IFDIR;
3200+
3201+
fMode |= flag;
3202+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
31903203
fMode |= S_IFDIR;
31913204
else
31923205
fMode |= S_IFREG;

compat/win32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <windows.h>
77
#endif
88

9-
extern int file_attr_to_st_mode (DWORD attr, DWORD tag);
9+
extern int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path);
1010

1111
static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
1212
{

compat/win32/fscache.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,29 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache, struct fsent
185185
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
186186
fdata->EaSize : 0;
187187

188-
fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes, fdata->EaSize);
188+
/*
189+
* On certain Windows versions, host directories mapped into
190+
* Windows Containers ("Volumes", see https://docs.docker.com/storage/volumes/)
191+
* look like symbolic links, but their targets are paths that
192+
* are valid only in kernel mode.
193+
*
194+
* Let's work around this by detecting that situation and
195+
* telling Git that these are *not* symbolic links.
196+
*/
197+
if (fse->reparse_tag == IO_REPARSE_TAG_SYMLINK &&
198+
sizeof(buf) > (list ? list->len + 1 : 0) + fse->len + 1 &&
199+
is_inside_windows_container()) {
200+
size_t off = 0;
201+
if (list) {
202+
memcpy(buf, list->name, list->len);
203+
buf[list->len] = '/';
204+
off = list->len + 1;
205+
}
206+
memcpy(buf + off, fse->name, fse->len);
207+
buf[off + fse->len] = '\0';
208+
}
209+
210+
fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes, fdata->EaSize, buf);
189211
fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_LONG_PATH :
190212
fdata->EndOfFile.LowPart | (((off_t)fdata->EndOfFile.HighPart) << 32);
191213
filetime_to_timespec((FILETIME *)&(fdata->LastAccessTime), &(fse->u.s.st_atim));

0 commit comments

Comments
 (0)