Skip to content

Commit b49ffe2

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 <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 72bc74a commit b49ffe2

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

Diff for: compat/mingw.c

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

42734273
return inside_container;
42744274
}
4275+
4276+
int file_attr_to_st_mode (DWORD attr, DWORD tag)
4277+
{
4278+
int fMode = S_IREAD;
4279+
if ((attr & FILE_ATTRIBUTE_REPARSE_POINT) && tag == IO_REPARSE_TAG_SYMLINK)
4280+
fMode |= S_IFLNK;
4281+
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
4282+
fMode |= S_IFDIR;
4283+
else
4284+
fMode |= S_IFREG;
4285+
if (!(attr & FILE_ATTRIBUTE_READONLY))
4286+
fMode |= S_IWRITE;
4287+
return fMode;
4288+
}

Diff for: 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)