Skip to content

Commit 6f7e3a6

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 e501e6b commit 6f7e3a6

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
@@ -984,7 +984,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
984984
buf->st_uid = 0;
985985
buf->st_nlink = 1;
986986
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
987-
reparse_tag);
987+
reparse_tag, file_name);
988988
buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
989989
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
990990
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1035,7 +1035,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
10351035
buf->st_gid = 0;
10361036
buf->st_uid = 0;
10371037
buf->st_nlink = 1;
1038-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
1038+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
10391039
buf->st_size = fdata.nFileSizeLow |
10401040
(((off_t)fdata.nFileSizeHigh)<<32);
10411041
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3856,12 +3856,25 @@ int is_inside_windows_container(void)
38563856
return inside_container;
38573857
}
38583858

3859-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3859+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
38603860
{
38613861
int fMode = S_IREAD;
3862-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3863-
fMode |= S_IFLNK;
3864-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3862+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3863+
tag == IO_REPARSE_TAG_SYMLINK) {
3864+
int flag = S_IFLNK;
3865+
char buf[MAX_LONG_PATH];
3866+
3867+
/*
3868+
* Windows containers' mapped volumes are marked as reparse
3869+
* points and look like symbolic links, but they are not.
3870+
*/
3871+
if (path && is_inside_windows_container() &&
3872+
readlink(path, buf, sizeof(buf)) > 27 &&
3873+
starts_with(buf, "/ContainerMappedDirectories/"))
3874+
flag = S_IFDIR;
3875+
3876+
fMode |= flag;
3877+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
38653878
fMode |= S_IFDIR;
38663879
else
38673880
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
@@ -200,8 +200,30 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
200200
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
201201
fdata->EaSize : 0;
202202

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

0 commit comments

Comments
 (0)