Skip to content

Commit ca7fda8

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 8fd75c0 commit ca7fda8

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
@@ -980,7 +980,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
980980
buf->st_uid = 0;
981981
buf->st_nlink = 1;
982982
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
983-
reparse_tag);
983+
reparse_tag, file_name);
984984
buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
985985
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
986986
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1031,7 +1031,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
10311031
buf->st_gid = 0;
10321032
buf->st_uid = 0;
10331033
buf->st_nlink = 1;
1034-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
1034+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
10351035
buf->st_size = fdata.nFileSizeLow |
10361036
(((off_t)fdata.nFileSizeHigh)<<32);
10371037
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3708,12 +3708,25 @@ int is_inside_windows_container(void)
37083708
return inside_container;
37093709
}
37103710

3711-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3711+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
37123712
{
37133713
int fMode = S_IREAD;
3714-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3715-
fMode |= S_IFLNK;
3716-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3714+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3715+
tag == IO_REPARSE_TAG_SYMLINK) {
3716+
int flag = S_IFLNK;
3717+
char buf[MAX_LONG_PATH];
3718+
3719+
/*
3720+
* Windows containers' mapped volumes are marked as reparse
3721+
* points and look like symbolic links, but they are not.
3722+
*/
3723+
if (path && is_inside_windows_container() &&
3724+
readlink(path, buf, sizeof(buf)) > 27 &&
3725+
starts_with(buf, "/ContainerMappedDirectories/"))
3726+
flag = S_IFDIR;
3727+
3728+
fMode |= flag;
3729+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
37173730
fMode |= S_IFDIR;
37183731
else
37193732
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
@@ -197,8 +197,30 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
197197
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
198198
fdata->EaSize : 0;
199199

200+
/*
201+
* On certain Windows versions, host directories mapped into
202+
* Windows Containers ("Volumes", see https://docs.docker.com/storage/volumes/)
203+
* look like symbolic links, but their targets are paths that
204+
* are valid only in kernel mode.
205+
*
206+
* Let's work around this by detecting that situation and
207+
* telling Git that these are *not* symbolic links.
208+
*/
209+
if (fse->reparse_tag == IO_REPARSE_TAG_SYMLINK &&
210+
sizeof(buf) > (list ? list->len + 1 : 0) + fse->len + 1 &&
211+
is_inside_windows_container()) {
212+
size_t off = 0;
213+
if (list) {
214+
memcpy(buf, list->dirent.d_name, list->len);
215+
buf[list->len] = '/';
216+
off = list->len + 1;
217+
}
218+
memcpy(buf + off, fse->dirent.d_name, fse->len);
219+
buf[off + fse->len] = '\0';
220+
}
221+
200222
fse->st_mode = file_attr_to_st_mode(fdata->FileAttributes,
201-
fdata->EaSize);
223+
fdata->EaSize, buf);
202224
fse->dirent.d_type = S_ISREG(fse->st_mode) ? DT_REG :
203225
S_ISDIR(fse->st_mode) ? DT_DIR : DT_LNK;
204226
fse->u.s.st_size = S_ISLNK(fse->st_mode) ? MAX_LONG_PATH :

0 commit comments

Comments
 (0)