Skip to content

Commit 48de3c0

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 e4147ae commit 48de3c0

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
@@ -760,14 +760,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
760760
return 1;
761761
}
762762

763-
/* We keep the do_lstat code in a separate function to avoid recursion.
764-
* When a path ends with a slash, the stat will fail with ENOENT. In
765-
* this case, we strip the trailing slashes and stat again.
766-
*
767-
* If follow is true then act like stat() and report on the link
768-
* target. Otherwise report on the link itself.
769-
*/
770-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
763+
int mingw_lstat(const char *file_name, struct stat *buf)
771764
{
772765
WIN32_FILE_ATTRIBUTE_DATA fdata;
773766
wchar_t wfilename[MAX_LONG_PATH];
@@ -801,13 +794,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
801794
if (handle != INVALID_HANDLE_VALUE) {
802795
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
803796
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
804-
if (follow) {
805-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
806-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
807-
} else {
808-
buf->st_mode = S_IFLNK;
809-
}
810-
buf->st_mode |= S_IREAD;
797+
buf->st_mode = S_IFLNK | S_IREAD;
811798
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
812799
buf->st_mode |= S_IWRITE;
813800
}
@@ -867,11 +854,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
867854
return 0;
868855
}
869856

870-
int mingw_lstat(const char *file_name, struct stat *buf)
871-
{
872-
return do_lstat(0, file_name, buf);
873-
}
874-
875857
int mingw_stat(const char *file_name, struct stat *buf)
876858
{
877859
wchar_t wfile_name[MAX_LONG_PATH];

0 commit comments

Comments
 (0)