Skip to content

Commit dc7ba21

Browse files
kbleesvdye
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 a5f561c commit dc7ba21

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

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

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

0 commit comments

Comments
 (0)