Skip to content

Commit aac29d8

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
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 cb31cf2 commit aac29d8

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
@@ -1039,7 +1039,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
10391039
buf->st_uid = 0;
10401040
buf->st_nlink = 1;
10411041
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
1042-
reparse_tag);
1042+
reparse_tag, file_name);
10431043
buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
10441044
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
10451045
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1090,7 +1090,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
10901090
buf->st_gid = 0;
10911091
buf->st_uid = 0;
10921092
buf->st_nlink = 1;
1093-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
1093+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
10941094
buf->st_size = fdata.nFileSizeLow |
10951095
(((off_t)fdata.nFileSizeHigh)<<32);
10961096
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3948,12 +3948,25 @@ int is_inside_windows_container(void)
39483948
return inside_container;
39493949
}
39503950

3951-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3951+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
39523952
{
39533953
int fMode = S_IREAD;
3954-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3955-
fMode |= S_IFLNK;
3956-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3954+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3955+
tag == IO_REPARSE_TAG_SYMLINK) {
3956+
int flag = S_IFLNK;
3957+
char buf[MAX_LONG_PATH];
3958+
3959+
/*
3960+
* Windows containers' mapped volumes are marked as reparse
3961+
* points and look like symbolic links, but they are not.
3962+
*/
3963+
if (path && is_inside_windows_container() &&
3964+
readlink(path, buf, sizeof(buf)) > 27 &&
3965+
starts_with(buf, "/ContainerMappedDirectories/"))
3966+
flag = S_IFDIR;
3967+
3968+
fMode |= flag;
3969+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
39573970
fMode |= S_IFDIR;
39583971
else
39593972
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
@@ -202,8 +202,30 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
202202
fdata->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ?
203203
fdata->EaSize : 0;
204204

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

0 commit comments

Comments
 (0)