mingw: drop the separate `do_lstat()` function

With the new `mingw_stat()` implementation, `do_lstat()` is only called
from `mingw_lstat()` (with the function parameter `follow == 0`). Remove
the extra function and the old `mingw_stat()`-specific (`follow == 1`)
logic.

Signed-off-by: Karsten Blees <karsten.blees@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/mingw.c b/compat/mingw.c
index 13970ae729872e2c80994246849293c42de9d42d..ec6c2801d3cbf40731dacb6576d82d7b771dfa96 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -917,15 +917,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
        return 1;
 }
 
-/* We keep the do_lstat code in a separate function to avoid recursion.
- * When a path ends with a slash, the call to `GetFileAttributedExW()`
- * would fail. To prevent this, we strip any trailing slashes before that
- * call.
- *
- * If follow is true then act like stat() and report on the link
- * target. Otherwise report on the link itself.
- */
-static int do_lstat(int follow, const char *file_name, struct stat *buf)
+int mingw_lstat(const char *file_name, struct stat *buf)
 {
        WIN32_FILE_ATTRIBUTE_DATA fdata;
        wchar_t wfilename[MAX_PATH];
@@ -959,13 +951,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
                        if (handle != INVALID_HANDLE_VALUE) {
                                if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
                                                (findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
-                                       if (follow) {
-                                               char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
-                                               buf->st_size = readlink(file_name, buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
-                                       } else {
-                                               buf->st_mode = S_IFLNK;
-                                       }
-                                       buf->st_mode |= S_IREAD;
+                                       buf->st_mode = S_IFLNK | S_IREAD;
                                        if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
                                                buf->st_mode |= S_IWRITE;
                                }
@@ -1023,11 +1009,6 @@ static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
        return 0;
 }
 
-int mingw_lstat(const char *file_name, struct stat *buf)
-{
-       return do_lstat(0, file_name, buf);
-}
-
 int mingw_stat(const char *file_name, struct stat *buf)
 {
        wchar_t wfile_name[MAX_PATH];