diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-20 15:17:27 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-20 15:17:27 +0000 |
| commit | b57f08306e54b560fcbd7ca0d3ade319824f9eee (patch) | |
| tree | 0b1b7874e684bdd55cc30886dae7d3b1a15a4187 | |
| parent | 1227e8c08bb51ce260d569f862164bc11dbbeabf (diff) | |
| download | coreutils-b57f08306e54b560fcbd7ca0d3ade319824f9eee.tar.xz | |
the patch from 2006-08-18 broke on cygwin.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/stat.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-08-20 Eric Blake <ebb9@byu.net> + + * src/stat.c (USE_STATVFS): Reinstate the patch from 2006-08-15; + the patch from 2006-08-18 broke on cygwin. + 2006-08-20 Jim Meyering <jim@meyering.net> * NEWS: Add a line for 6.2-cvs. diff --git a/src/stat.c b/src/stat.c index 4ea66fde7..777266ea3 100644 --- a/src/stat.c +++ b/src/stat.c @@ -21,7 +21,7 @@ #if (STAT_STATVFS \ && (HAVE_STRUCT_STATVFS_F_BASETYPE || HAVE_STRUCT_STATVFS_F_FSTYPENAME \ - || ! HAVE_STRUCT_STATFS_F_FSTYPENAME)) + || (! HAVE_STRUCT_STATFS_F_FSTYPENAME && HAVE_STRUCT_STATVFS_F_TYPE))) # define USE_STATVFS 1 #else # define USE_STATVFS 0 @@ -139,7 +139,8 @@ static char const *trailing_delim = ""; Some systems have statfvs.f_basetype[FSTYPSZ] (AIX, HP-UX, and Solaris). Others have statvfs.f_fstypename[_VFS_NAMELEN] (NetBSD 3.0). Others have statfs.f_fstypename[MFSNAMELEN] (NetBSD 1.5.2). - Still others have neither and have to get by with f_type (Linux). */ + Still others have neither and have to get by with f_type (Linux). + But f_type may only exist in statfs (Cygwin). */ static char const * human_fstype (STRUCT_STATVFS const *statfsbuf) { |