Merge branch 'js/mingw-stat'

* js/mingw-stat:
  Revert "Windows: Use a customized struct stat that also has the st_blocks member."
  compat: introduce on_disk_bytes()
This commit is contained in:
Junio C Hamano 2008-08-19 21:25:48 -07:00
commit 55e839e378
5 changed files with 26 additions and 43 deletions

View File

@ -124,6 +124,9 @@ all::
# Define USE_STDEV below if you want git to care about the underlying device # Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-index perspective. # change being considered an inode change from the update-index perspective.
# #
# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
# field that counts the on-disk footprint in 512-byte blocks.
#
# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
# #
# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72. # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
@ -749,6 +752,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_SVN_TESTS = YesPlease NO_SVN_TESTS = YesPlease
NO_PERL_MAKEMAKER = YesPlease NO_PERL_MAKEMAKER = YesPlease
NO_POSIX_ONLY_PROGRAMS = YesPlease NO_POSIX_ONLY_PROGRAMS = YesPlease
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat
COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1 COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@ -863,6 +867,9 @@ endif
ifdef NO_D_INO_IN_DIRENT ifdef NO_D_INO_IN_DIRENT
BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
endif endif
ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
endif
ifdef NO_C99_FORMAT ifdef NO_C99_FORMAT
BASIC_CFLAGS += -DNO_C99_FORMAT BASIC_CFLAGS += -DNO_C99_FORMAT
endif endif

View File

@ -43,7 +43,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
if (lstat(path, &st) || !S_ISREG(st.st_mode)) if (lstat(path, &st) || !S_ISREG(st.st_mode))
bad = 1; bad = 1;
else else
(*loose_size) += xsize_t(st.st_blocks); (*loose_size) += xsize_t(on_disk_bytes(st));
} }
if (bad) { if (bad) {
if (verbose) { if (verbose) {
@ -115,7 +115,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
num_pack++; num_pack++;
} }
printf("count: %lu\n", loose); printf("count: %lu\n", loose);
printf("size: %lu\n", loose_size / 2); printf("size: %lu\n", loose_size / 1024);
printf("in-pack: %lu\n", packed); printf("in-pack: %lu\n", packed);
printf("packs: %lu\n", num_pack); printf("packs: %lu\n", num_pack);
printf("prune-packable: %lu\n", packed_loose); printf("prune-packable: %lu\n", packed_loose);

View File

@ -31,11 +31,6 @@ 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
@ -57,10 +52,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_blocks = size_to_blocks(buf->st_size); buf->st_dev = buf->st_rdev = (_getdrive() - 1);
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));
@ -94,7 +89,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 mingw_stat *buf) int mingw_lstat(const char *file_name, struct stat *buf)
{ {
int namelen; int namelen;
static char alt_name[PATH_MAX]; static char alt_name[PATH_MAX];
@ -122,8 +117,7 @@ int mingw_lstat(const char *file_name, struct mingw_stat *buf)
} }
#undef fstat #undef fstat
#undef stat int mingw_fstat(int fd, struct stat *buf)
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;
@ -133,22 +127,8 @@ int mingw_fstat(int fd, struct mingw_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)
struct stat st; return fstat(fd, buf);
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;
@ -162,10 +142,10 @@ int mingw_fstat(int fd, struct mingw_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_blocks = size_to_blocks(buf->st_size); buf->st_dev = buf->st_rdev = (_getdrive() - 1);
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));

View File

@ -162,22 +162,12 @@ 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.
*/ */
struct mingw_stat { int mingw_lstat(const char *file_name, struct stat *buf);
unsigned st_mode; int mingw_fstat(int fd, struct stat *buf);
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 mingw_stat #define stat(x,y) mingw_lstat(x,y)
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

View File

@ -192,6 +192,12 @@ extern int git_munmap(void *start, size_t length);
#endif /* NO_MMAP */ #endif /* NO_MMAP */
#ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
#define on_disk_bytes(st) ((st).st_size)
#else
#define on_disk_bytes(st) ((st).st_blocks * 512)
#endif
#define DEFAULT_PACKED_GIT_LIMIT \ #define DEFAULT_PACKED_GIT_LIMIT \
((1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256)) ((1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256))