Skip to content

Commit 8496fa3

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 a3b6013 commit 8496fa3

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
@@ -1027,7 +1027,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
10271027
buf->st_uid = 0;
10281028
buf->st_nlink = 1;
10291029
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
1030-
reparse_tag);
1030+
reparse_tag, file_name);
10311031
buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
10321032
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
10331033
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1078,7 +1078,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
10781078
buf->st_gid = 0;
10791079
buf->st_uid = 0;
10801080
buf->st_nlink = 1;
1081-
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
1081+
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
10821082
buf->st_size = fdata.nFileSizeLow |
10831083
(((off_t)fdata.nFileSizeHigh)<<32);
10841084
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3922,12 +3922,25 @@ int is_inside_windows_container(void)
39223922
return inside_container;
39233923
}
39243924

3925-
int file_attr_to_st_mode (DWORD attr, DWORD tag)
3925+
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
39263926
{
39273927
int fMode = S_IREAD;
3928-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
3929-
fMode |= S_IFLNK;
3930-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
3928+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
3929+
tag == IO_REPARSE_TAG_SYMLINK) {
3930+
int flag = S_IFLNK;
3931+
char buf[MAX_LONG_PATH];
3932+
3933+
/*
3934+
* Windows containers' mapped volumes are marked as reparse
3935+
* points and look like symbolic links, but they are not.
3936+
*/
3937+
if (path && is_inside_windows_container() &&
3938+
readlink(path, buf, sizeof(buf)) > 27 &&
3939+
starts_with(buf, "/ContainerMappedDirectories/"))
3940+
flag = S_IFDIR;
3941+
3942+
fMode |= flag;
3943+
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
39313944
fMode |= S_IFDIR;
39323945
else
39333946
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)