Skip to content

Commit 1c97ef3

Browse files
dschoGit for Windows Build Agent
authored andcommitted
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 500cf17 commit 1c97ef3

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
@@ -945,7 +945,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
945945
buf->st_uid = 0;
946946
buf->st_nlink = 1;
947947
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
948-
findbuf.dwReserved0);
948+
findbuf.dwReserved0, file_name);
949949
buf->st_size = S_ISLNK(buf->st_mode) ? MAX_LONG_PATH :
950950
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
951951
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -996,7 +996,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
996996
buf->st_gid = 0;
997997
buf->st_uid = 0;
998998
buf->st_nlink = 1;
999-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
999+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
10001000
buf->st_size = fdata.nFileSizeLow |
10011001
(((off_t)fdata.nFileSizeHigh)<<32);
10021002
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3480,12 +3480,25 @@ int is_inside_windows_container(void)
34803480
return inside_container;
34813481
}
34823482

3483-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3483+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
34843484
{
34853485
int fMode = S_IREAD;
3486-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3487-
fMode |= S_IFLNK;
3488-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3486+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3487+
tag == IO_REPARSE_TAG_SYMLINK) {
3488+
int flag = S_IFLNK;
3489+
char buf[MAX_LONG_PATH];
3490+
3491+
/*
3492+
* Windows containers' mapped volumes are marked as reparse
3493+
* points and look like symbolic links, but they are not.
3494+
*/
3495+
if (path && is_inside_windows_container() &&
3496+
readlink(path, buf, sizeof(buf)) > 27 &&
3497+
starts_with(buf, "/ContainerMappedDirectories/"))
3498+
flag = S_IFDIR;
3499+
3500+
fMode |= flag;
3501+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
34893502
fMode |= S_IFDIR;
34903503
else
34913504
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
@@ -194,8 +194,30 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
194194
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
195195
fdata->EaSize : 0;
196196

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

0 commit comments

Comments
 (0)