Skip to content

Commit 51cdf17

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 12fcb4f commit 51cdf17

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
@@ -536,14 +536,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
536536
return 1;
537537
}
538538

539-
/* We keep the do_lstat code in a separate function to avoid recursion.
540-
* When a path ends with a slash, the stat will fail with ENOENT. In
541-
* this case, we strip the trailing slashes and stat again.
542-
*
543-
* If follow is true then act like stat() and report on the link
544-
* target. Otherwise report on the link itself.
545-
*/
546-
static int do_lstat(int follow, const char *file_name, struct stat *buf)
539+
int mingw_lstat(const char *file_name, struct stat *buf)
547540
{
548541
WIN32_FILE_ATTRIBUTE_DATA fdata;
549542
wchar_t wfilename[MAX_LONG_PATH];
@@ -577,13 +570,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
577570
if (handle != INVALID_HANDLE_VALUE) {
578571
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
579572
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
580-
if (follow) {
581-
char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
582-
buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
583-
} else {
584-
buf->st_mode = S_IFLNK;
585-
}
586-
buf->st_mode |= S_IREAD;
573+
buf->st_mode = S_IFLNK | S_IREAD;
587574
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
588575
buf->st_mode |= S_IWRITE;
589576
}
@@ -620,11 +607,6 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
620607

621608
int (*lstat)(const char *file_name, struct stat *buf) = mingw_lstat;
622609

623-
int mingw_lstat(const char *file_name, struct stat *buf)
624-
{
625-
return do_lstat(0, file_name, buf);
626-
}
627-
628610
static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
629611
{
630612
BY_HANDLE_FILE_INFORMATION fdata;

0 commit comments

Comments
 (0)