mingw: factor out code to set stat() data

In our fstat() emulation, we convert the file metadata from Win32 data
structures to an emulated POSIX structure.

To structure the code better, let's factor that part out into its own
function.

Note: it would be tempting to try to unify this code with the part of
do_lstat() that does the same thing, but they operate on different data
structures: BY_HANDLE_FILE_INFORMATION vs WIN32_FILE_ATTRIBUTE_DATA. So
unfortunately, they cannot be unified.

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 18caf21969a5917e8e6c6d754beffbba2741e6c2..d2e7d86db557685d92492ee8f70d0d3bdf224fce 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -736,6 +736,29 @@ static int do_stat_internal(int follow, const char *file_name, struct stat *buf)
        return do_lstat(follow, alt_name, buf);
 }
 
        return do_lstat(follow, alt_name, buf);
 }
 

+static int get_file_info_by_handle(HANDLE hnd, struct stat *buf)
+{
+       BY_HANDLE_FILE_INFORMATION fdata;
+
+       if (!GetFileInformationByHandle(hnd, &fdata)) {
+               errno = err_win_to_posix(GetLastError());
+               return -1;
+       }
+
+       buf->st_ino = 0;
+       buf->st_gid = 0;
+       buf->st_uid = 0;
+       buf->st_nlink = 1;
+       buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
+       buf->st_size = fdata.nFileSizeLow |
+               (((off_t)fdata.nFileSizeHigh)<<32);
+       buf->st_dev = buf->st_rdev = 0; /* not used by Git */
+       buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
+       buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
+       buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
+       return 0;
+}
+

 int mingw_lstat(const char *file_name, struct stat *buf)
 {
        return do_stat_internal(0, file_name, buf);
 int mingw_lstat(const char *file_name, struct stat *buf)
 {
        return do_stat_internal(0, file_name, buf);


@@ -748,7 +771,6 @@ int mingw_stat(const char *file_name, struct stat *buf)
 int mingw_fstat(int fd, struct stat *buf)
 {
        HANDLE fh = (HANDLE)_get_osfhandle(fd);
 int mingw_fstat(int fd, struct stat *buf)
 {
        HANDLE fh = (HANDLE)_get_osfhandle(fd);

-       BY_HANDLE_FILE_INFORMATION fdata;

 
        if (fh == INVALID_HANDLE_VALUE) {
                errno = EBADF;
 
        if (fh == INVALID_HANDLE_VALUE) {
                errno = EBADF;


@@ -758,20 +780,9 @@ int mingw_fstat(int fd, struct stat *buf)
        if (GetFileType(fh) != FILE_TYPE_DISK)
                return _fstati64(fd, buf);
 
        if (GetFileType(fh) != FILE_TYPE_DISK)
                return _fstati64(fd, buf);
 

-       if (GetFileInformationByHandle(fh, &fdata)) {
-               buf->st_ino = 0;
-               buf->st_gid = 0;
-               buf->st_uid = 0;
-               buf->st_nlink = 1;
-               buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
-               buf->st_size = fdata.nFileSizeLow |
-                       (((off_t)fdata.nFileSizeHigh)<<32);
-               buf->st_dev = buf->st_rdev = 0; /* not used by Git */
-               buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
-               buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
-               buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
+       if (!get_file_info_by_handle(fh, buf))

                return 0;
                return 0;

-       }
+

        errno = EBADF;
        return -1;
 }
        errno = EBADF;
        return -1;
 }