Skip to content

Commit f33e574

Browse files
ZCubedscho
authored andcommitted
mingw: move the file_attr_to_st_mode() function definition
In preparation for making this function a bit more complicated (to allow for special-casing the `ContainerMappedDirectories` in Windows containers, which look like a symbolic link, but are not), let's move it out of the header. Signed-off-by: JiSeop Moon <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent eb17c48 commit f33e574

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

compat/mingw.c

+14
Original file line numberDiff line numberDiff line change
@@ -4185,3 +4185,17 @@ int is_inside_windows_container(void)
41854185

41864186
return inside_container;
41874187
}
4188+
4189+
int file_attr_to_st_mode (DWORD attr, DWORD tag)
4190+
{
4191+
int fMode = S_IREAD;
4192+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
4193+
fMode |= S_IFLNK;
4194+
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
4195+
fMode |= S_IFDIR;
4196+
else
4197+
fMode |= S_IFREG;
4198+
if (!(attr & FILE_ATTRIBUTE_READONLY))
4199+
fMode |= S_IWRITE;
4200+
return fMode;
4201+
}

compat/win32.h

+1-13
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,7 @@
66
#include <windows.h>
77
#endif
88

9-
static inline int file_attr_to_st_mode (DWORD attr, DWORD tag)
10-
{
11-
int fMode = S_IREAD;
12-
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
13-
fMode |= S_IFLNK;
14-
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
15-
fMode |= S_IFDIR;
16-
else
17-
fMode |= S_IFREG;
18-
if (!(attr & FILE_ATTRIBUTE_READONLY))
19-
fMode |= S_IWRITE;
20-
return fMode;
21-
}
9+
extern int file_attr_to_st_mode (DWORD attr, DWORD tag);
2210

2311
static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
2412
{

0 commit comments

Comments
 (0)