Skip to content

Commit 46913db

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 8e5e642 commit 46913db

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

788-
/* We keep the do_lstat code in a separate function to avoid recursion.
789-
* When a path ends with a slash, the stat will fail with ENOENT. In
790-
* this case, we strip the trailing slashes and stat again.
791-
*
792-
* If follow is true then act like stat() and report on the link
793-
* target. Otherwise report on the link itself.
794-
*/
795-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
788+
int mingw_lstat(const char *file_name, struct stat *buf)
796789
{
797790
WIN32_FILE_ATTRIBUTE_DATA fdata;
798791
wchar_t wfilename[MAX_LONG_PATH];
@@ -826,13 +819,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
826819
if (handle != INVALID_HANDLE_VALUE) {
827820
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
828821
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
829-
if (follow) {
830-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
831-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
832-
} else {
833-
buf->st_mode = S_IFLNK;
834-
}
835-
buf->st_mode |= S_IREAD;
822+
buf->st_mode = S_IFLNK | S_IREAD;
836823
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
837824
buf->st_mode |= S_IWRITE;
838825
}
@@ -892,11 +879,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
892879
return 0;
893880
}
894881

895-
int mingw_lstat(const char *file_name, struct stat *buf)
896-
{
897-
return do_lstat(0, file_name, buf);
898-
}
899-
900882
int mingw_stat(const char *file_name, struct stat *buf)
901883
{
902884
wchar_t wfile_name[MAX_LONG_PATH];

0 commit comments

Comments
 (0)