Skip to content

Commit 22bf97f

Browse files
kbleesdscho
authored andcommitted
Win32: remove separate do_lstat() function
With the new mingw_stat() implementation, do_lstat() is only called from mingw_lstat() (with follow == 0). Remove the extra function and the old mingw_stat()-specific (follow == 1) logic. Signed-off-by: Karsten Blees <[email protected]>
1 parent 86f1eae commit 22bf97f

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

compat/mingw.c

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -865,14 +865,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
865865
return 1;
866866
}
867867

868-
/* We keep the do_lstat code in a separate function to avoid recursion.
869-
* When a path ends with a slash, the stat will fail with ENOENT. In
870-
* this case, we strip the trailing slashes and stat again.
871-
*
872-
* If follow is true then act like stat() and report on the link
873-
* target. Otherwise report on the link itself.
874-
*/
875-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
868+
int mingw_lstat(const char *file_name, struct stat *buf)
876869
{
877870
WIN32_FILE_ATTRIBUTE_DATA fdata;
878871
wchar_t wfilename[MAX_LONG_PATH];
@@ -906,13 +899,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
906899
if (handle != INVALID_HANDLE_VALUE) {
907900
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
908901
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
909-
if (follow) {
910-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
911-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
912-
} else {
913-
buf->st_mode = S_IFLNK;
914-
}
915-
buf->st_mode |= S_IREAD;
902+
buf->st_mode = S_IFLNK | S_IREAD;
916903
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
917904
buf->st_mode |= S_IWRITE;
918905
}
@@ -972,11 +959,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
972959
return 0;
973960
}
974961

975-
int mingw_lstat(const char *file_name, struct stat *buf)
976-
{
977-
return do_lstat(0, file_name, buf);
978-
}
979-
980962
int mingw_stat(const char *file_name, struct stat *buf)
981963
{
982964
wchar_t wfile_name[MAX_LONG_PATH];

0 commit comments

Comments
 (0)