Skip to content

Commit 655c3b9

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 4ae705d commit 655c3b9

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
@@ -788,14 +788,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
788788
return 1;
789789
}
790790

791-
/* We keep the do_lstat code in a separate function to avoid recursion.
792-
* When a path ends with a slash, the stat will fail with ENOENT. In
793-
* this case, we strip the trailing slashes and stat again.
794-
*
795-
* If follow is true then act like stat() and report on the link
796-
* target. Otherwise report on the link itself.
797-
*/
798-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
791+
int mingw_lstat(const char *file_name, struct stat *buf)
799792
{
800793
WIN32_FILE_ATTRIBUTE_DATA fdata;
801794
wchar_t wfilename[MAX_LONG_PATH];
@@ -829,13 +822,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
829822
if (handle != INVALID_HANDLE_VALUE) {
830823
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
831824
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
832-
if (follow) {
833-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
834-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
835-
} else {
836-
buf->st_mode = S_IFLNK;
837-
}
838-
buf->st_mode |= S_IREAD;
825+
buf->st_mode = S_IFLNK | S_IREAD;
839826
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
840827
buf->st_mode |= S_IWRITE;
841828
}
@@ -895,11 +882,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
895882
return 0;
896883
}
897884

898-
int mingw_lstat(const char *file_name, struct stat *buf)
899-
{
900-
return do_lstat(0, file_name, buf);
901-
}
902-
903885
int mingw_stat(const char *file_name, struct stat *buf)
904886
{
905887
wchar_t wfile_name[MAX_LONG_PATH];

0 commit comments

Comments
 (0)