diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-18 21:57:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-18 22:37:55 -0700 |
| commit | fdb2a2a600969598fd80f01b009fbbb020d596ab (patch) | |
| tree | 935e08662721c94bf3d4aabf2542653ae16bd20a /compat | |
| parent | Start 1.6.1 cycle (diff) | |
| download | tgif-fdb2a2a600969598fd80f01b009fbbb020d596ab.tar.xz | |
compat: introduce on_disk_bytes()
Some platforms do not have st_blocks member in "struct stat"; mingw
already emulates it by rounding it up to closest 512-byte blocks (even
though it could overcount when a file has holes).
The reason to use the member is only to figure out how many kilobytes the
files occupy on-disk, so give a helper function in git-compat-util.h to
compute this value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 8 | ||||
| -rw-r--r-- | compat/mingw.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 772cad510d..798fb6178a 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -31,11 +31,6 @@ 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 @@ -59,7 +54,6 @@ static int do_lstat(const char *file_name, struct stat *buf) buf->st_uid = 0; buf->st_mode = fMode; buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */ - 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)); @@ -142,7 +136,6 @@ int mingw_fstat(int fd, struct mingw_stat *buf) 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; @@ -164,7 +157,6 @@ int mingw_fstat(int fd, struct mingw_stat *buf) buf->st_uid = 0; buf->st_mode = fMode; buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */ - 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)); diff --git a/compat/mingw.h b/compat/mingw.h index a52e657c51..1472d59772 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -169,7 +169,6 @@ struct mingw_stat { 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); |