git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-13 08:57:56 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

mingw: Windows Docker volumes are *not* symbolic links

Browse Source 
... 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 <johannes.schindelin@gmx.de>
Signed-off-by: JiSeop Moon <zcube@zcube.kr>
This commit is contained in:
Johannes Schindelin
2018-04-23 23:20:00 +02:00
committed by Git for Windows Build Agent
parent 3862b2e8f8
commit 15e1f0dc45
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
compat/mingw.c
View File

@@ -1267,7 +1267,7 @@ int mingw_lstat(const char *file_name, struct stat *buf)
buf->st_uid = 0;
buf->st_nlink = 1;
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes,
reparse_tag);
reparse_tag, file_name);
buf->st_size = S_ISLNK(buf->st_mode) ? link_len :
fdata.nFileSizeLow | (((off_t) fdata.nFileSizeHigh) << 32);
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -1316,7 +1316,7 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
buf->st_gid = 0;
buf->st_uid = 0;
buf->st_nlink = 1;
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0);
buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes, 0, NULL);
buf->st_size = fdata.nFileSizeLow |
(((off_t)fdata.nFileSizeHigh)<<32);
buf->st_dev = buf->st_rdev = 0; /* not used by Git */
@@ -3796,12 +3796,25 @@ int is_inside_windows_container(void)
return inside_container;
}
int file_attr_to_st_mode (DWORD attr, DWORD tag)
int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path)
{
int fMode = S_IREAD;
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
fMode |= S_IFLNK;
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) &&
tag == IO_REPARSE_TAG_SYMLINK) {
int flag = S_IFLNK;
char buf[MAX_LONG_PATH];
/*
* Windows containers' mapped volumes are marked as reparse
* points and look like symbolic links, but they are not.
*/
if (path && is_inside_windows_container() &&
readlink(path, buf, sizeof(buf)) > 27 &&
starts_with(buf, "/ContainerMappedDirectories/"))
flag = S_IFDIR;
fMode |= flag;
} else if (attr & FILE_ATTRIBUTE_DIRECTORY)
fMode |= S_IFDIR;
else
fMode |= S_IFREG;

2
compat/win32.h
View File

@@ -6,7 +6,7 @@
#include <windows.h>
#endif
extern int file_attr_to_st_mode (DWORD attr, DWORD tag);
extern int file_attr_to_st_mode (DWORD attr, DWORD tag, const char *path);
static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
{