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>
This commit is contained in:
parent
7c0ffa1cb7
commit
fc2ded5b08
@ -31,6 +31,11 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
|
|||||||
return (time_t)winTime;
|
return (time_t)winTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline size_t size_to_blocks(size_t s)
|
||||||
|
{
|
||||||
|
return (s+511)/512;
|
||||||
|
}
|
||||||
|
|
||||||
extern int _getdrive( void );
|
extern int _getdrive( void );
|
||||||
/* We keep the do_lstat code in a separate function to avoid recursion.
|
/* 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
|
* 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_ino = 0;
|
||||||
buf->st_gid = 0;
|
buf->st_gid = 0;
|
||||||
buf->st_uid = 0;
|
buf->st_uid = 0;
|
||||||
buf->st_nlink = 1;
|
|
||||||
buf->st_mode = fMode;
|
buf->st_mode = fMode;
|
||||||
buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */
|
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_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
|
||||||
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
|
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
|
||||||
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
|
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()
|
* complete. Note that Git stat()s are redirected to mingw_lstat()
|
||||||
* too, since Windows doesn't really handle symlinks that well.
|
* 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;
|
int namelen;
|
||||||
static char alt_name[PATH_MAX];
|
static char alt_name[PATH_MAX];
|
||||||
@ -117,7 +122,8 @@ int mingw_lstat(const char *file_name, struct stat *buf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#undef fstat
|
#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);
|
HANDLE fh = (HANDLE)_get_osfhandle(fd);
|
||||||
BY_HANDLE_FILE_INFORMATION fdata;
|
BY_HANDLE_FILE_INFORMATION fdata;
|
||||||
@ -127,8 +133,22 @@ int mingw_fstat(int fd, struct stat *buf)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* direct non-file handles to MS's fstat() */
|
/* direct non-file handles to MS's fstat() */
|
||||||
if (GetFileType(fh) != FILE_TYPE_DISK)
|
if (GetFileType(fh) != FILE_TYPE_DISK) {
|
||||||
return fstat(fd, buf);
|
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)) {
|
if (GetFileInformationByHandle(fh, &fdata)) {
|
||||||
int fMode = S_IREAD;
|
int fMode = S_IREAD;
|
||||||
@ -142,10 +162,10 @@ int mingw_fstat(int fd, struct stat *buf)
|
|||||||
buf->st_ino = 0;
|
buf->st_ino = 0;
|
||||||
buf->st_gid = 0;
|
buf->st_gid = 0;
|
||||||
buf->st_uid = 0;
|
buf->st_uid = 0;
|
||||||
buf->st_nlink = 1;
|
|
||||||
buf->st_mode = fMode;
|
buf->st_mode = fMode;
|
||||||
buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */
|
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_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
|
||||||
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
|
buf->st_mtime = filetime_to_time_t(&(fdata.ftLastWriteTime));
|
||||||
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
|
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
|
||||||
|
@ -59,8 +59,6 @@ struct itimerval {
|
|||||||
};
|
};
|
||||||
#define ITIMER_REAL 0
|
#define ITIMER_REAL 0
|
||||||
|
|
||||||
#define st_blocks st_size/512 /* will be cleaned up later */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* trivial stubs
|
* trivial stubs
|
||||||
*/
|
*/
|
||||||
@ -161,12 +159,22 @@ int mingw_rename(const char*, const char*);
|
|||||||
|
|
||||||
/* Use mingw_lstat() instead of lstat()/stat() and
|
/* Use mingw_lstat() instead of lstat()/stat() and
|
||||||
* mingw_fstat() instead of fstat() on Windows.
|
* mingw_fstat() instead of fstat() on Windows.
|
||||||
|
* struct stat is redefined because it lacks the st_blocks member.
|
||||||
*/
|
*/
|
||||||
int mingw_lstat(const char *file_name, struct stat *buf);
|
struct mingw_stat {
|
||||||
int mingw_fstat(int fd, struct stat *buf);
|
unsigned st_mode;
|
||||||
|
time_t st_mtime, st_atime, st_ctime;
|
||||||
|
unsigned st_dev, st_ino, st_uid, st_gid;
|
||||||
|
size_t st_size;
|
||||||
|
size_t st_blocks;
|
||||||
|
};
|
||||||
|
int mingw_lstat(const char *file_name, struct mingw_stat *buf);
|
||||||
|
int mingw_fstat(int fd, struct mingw_stat *buf);
|
||||||
#define fstat mingw_fstat
|
#define fstat mingw_fstat
|
||||||
#define lstat mingw_lstat
|
#define lstat mingw_lstat
|
||||||
#define stat(x,y) mingw_lstat(x,y)
|
#define stat mingw_stat
|
||||||
|
static inline int mingw_stat(const char *file_name, struct mingw_stat *buf)
|
||||||
|
{ return mingw_lstat(file_name, buf); }
|
||||||
|
|
||||||
int mingw_utime(const char *file_name, const struct utimbuf *times);
|
int mingw_utime(const char *file_name, const struct utimbuf *times);
|
||||||
#define utime mingw_utime
|
#define utime mingw_utime
|
||||||
|
Loading…
Reference in New Issue
Block a user