Skip to content

Commit 05512a4

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 1d64bbf commit 05512a4

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
@@ -858,14 +858,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
858858
return 1;
859859
}
860860

861-
/* We keep the do_lstat code in a separate function to avoid recursion.
862-
* When a path ends with a slash, the stat will fail with ENOENT. In
863-
* this case, we strip the trailing slashes and stat again.
864-
*
865-
* If follow is true then act like stat() and report on the link
866-
* target. Otherwise report on the link itself.
867-
*/
868-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
861+
int mingw_lstat(const char *file_name, struct stat *buf)
869862
{
870863
WIN32_FILE_ATTRIBUTE_DATA fdata;
871864
wchar_t wfilename[MAX_LONG_PATH];
@@ -899,13 +892,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
899892
if (handle != INVALID_HANDLE_VALUE) {
900893
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
901894
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
902-
if (follow) {
903-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
904-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
905-
} else {
906-
buf->st_mode = S_IFLNK;
907-
}
908-
buf->st_mode |= S_IREAD;
895+
buf->st_mode = S_IFLNK | S_IREAD;
909896
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
910897
buf->st_mode |= S_IWRITE;
911898
}
@@ -965,11 +952,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
965952
return 0;
966953
}
967954

968-
int mingw_lstat(const char *file_name, struct stat *buf)
969-
{
970-
return do_lstat(0, file_name, buf);
971-
}
972-
973955
int mingw_stat(const char *file_name, struct stat *buf)
974956
{
975957
wchar_t wfile_name[MAX_LONG_PATH];

0 commit comments

Comments
 (0)