diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2007-11-12 12:52:41 +0100 |
|---|---|---|
| committer | Johannes Sixt <johannes.sixt@telecom.at> | 2008-06-26 08:45:11 +0200 |
| commit | fc2ded5b08e071beed974117c0148781b1acc94a (patch) | |
| tree | 2aa9f32e7a58fb1e0f1fb701f69c9454a0a9b7b8 /compat/mingw.c | |
| parent | Windows: Add a custom implementation for utime(). (diff) | |
| download | tgif-fc2ded5b08e071beed974117c0148781b1acc94a.tar.xz | |
Windows: Use a customized struct stat that also has the st_blocks member.
Windows's struct stat does not have a st_blocks member. Since we already
have our own stat/lstat/fstat implementations, we can just as well use
a customized struct stat. This patch introduces just that, and also fills
in the st_blocks member. On the other hand, we don't provide members that
are never used.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Diffstat (limited to 'compat/mingw.c')
| -rw-r--r-- | compat/mingw.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 2e47555443..28d32969b9 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -31,6 +31,11 @@ static inline time_t filetime_to_time_t(const FILETIME *ft) return (time_t)winTime; } +static inline size_t size_to_blocks(size_t s) +{ + return (s+511)/512; +} + extern int _getdrive( void ); /* We keep the do_lstat code in a separate function to avoid recursion. * When a path ends with a slash, the stat will fail with ENOENT. In @@ -52,10 +57,10 @@ static int do_lstat(const char *file_name, struct stat *buf) buf->st_ino = 0; buf->st_gid = 0; buf->st_uid = 0; - buf->st_nlink = 1; buf->st_mode = fMode; buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */ - buf->st_dev = buf->st_rdev = (_getdrive() - 1); + buf->st_blocks = size_to_blocks(buf->st_size); + buf->st_dev = _getdrive() - 1; 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)); @@ -89,7 +94,7 @@ static int do_lstat(const char *file_name, struct stat *buf) * complete. Note that Git stat()s are redirected to mingw_lstat() * too, since Windows doesn't really handle symlinks that well. */ -int mingw_lstat(const char *file_name, struct stat *buf) +int mingw_lstat(const char *file_name, struct mingw_stat *buf) { int namelen; static char alt_name[PATH_MAX]; @@ -117,7 +122,8 @@ int mingw_lstat(const char *file_name, struct stat *buf) } #undef fstat -int mingw_fstat(int fd, struct stat *buf) +#undef stat +int mingw_fstat(int fd, struct mingw_stat *buf) { HANDLE fh = (HANDLE)_get_osfhandle(fd); BY_HANDLE_FILE_INFORMATION fdata; @@ -127,8 +133,22 @@ int mingw_fstat(int fd, struct stat *buf) return -1; } /* direct non-file handles to MS's fstat() */ - if (GetFileType(fh) != FILE_TYPE_DISK) - return fstat(fd, buf); + if (GetFileType(fh) != FILE_TYPE_DISK) { + struct stat st; + if (fstat(fd, &st)) + return -1; + buf->st_ino = st.st_ino; + buf->st_gid = st.st_gid; + buf->st_uid = st.st_uid; + buf->st_mode = st.st_mode; + buf->st_size = st.st_size; + buf->st_blocks = size_to_blocks(buf->st_size); + buf->st_dev = st.st_dev; + buf->st_atime = st.st_atime; + buf->st_mtime = st.st_mtime; + buf->st_ctime = st.st_ctime; + return 0; + } if (GetFileInformationByHandle(fh, &fdata)) { int fMode = S_IREAD; @@ -142,10 +162,10 @@ int mingw_fstat(int fd, struct stat *buf) buf->st_ino = 0; buf->st_gid = 0; buf->st_uid = 0; - buf->st_nlink = 1; buf->st_mode = fMode; buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */ - buf->st_dev = buf->st_rdev = (_getdrive() - 1); + buf->st_blocks = size_to_blocks(buf->st_size); + buf->st_dev = _getdrive() - 1; 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)); |