* m4/jm-macros.m4 (gl_MACROS): Call cu_PREREQ_STAT_PROG rather

than AC_REQUIREing, so that sys/mount.h isn't tested for after
the test result.  I'm not sure why this fix is needed, but it
works.
* m4/stat-prog.m4 (cu_PREREQ_STAT_PROG): Revamp to reflect better
what stat.c actually needs.
* src/stat.c: Include <stddef.h>
(alignof): New macro.
(HAVE_STRUCT_STATXFS_F_FSID___VAL, HAVE_STRUCT_STATXFS_F_FSID_VAL):
Remove.
(STRUCT_STATXFS_F_FSID_IS_INTEGER): New macro.
(FSID_VAL): Remove.
(print_statfs): If f_fsid isn't an integer, grab its words one
at a time in little-endian order.  This is a bit easier to configure
and should avoid a compilation failure on MacOS reported by Bruno
Haible.

diff --git a/ChangeLog b/ChangeLog
index 3f3152b28ce13d40213ef1aab7d752adfa457b3e..986976c1a48a76d4ace2dfa0ca4e7803540ee0c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * src/stat.c: Include <stddef.h>
+       (alignof): New macro.
+       (HAVE_STRUCT_STATXFS_F_FSID___VAL, HAVE_STRUCT_STATXFS_F_FSID_VAL):
+       Remove.
+       (STRUCT_STATXFS_F_FSID_IS_INTEGER): New macro.
+       (FSID_VAL): Remove.
+       (print_statfs): If f_fsid isn't an integer, grab its words one
+       at a time in little-endian order.  This is a bit easier to configure
+       and should avoid a compilation failure on MacOS reported by Bruno
+       Haible.
+
 2006-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/stat.c (HAVE_STRUCT_STATXFS_F_FSID_VAL, FSID_VAL): New macros, to

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 176ef0e7fe77f1c3b44950cd8d51708ba100f2f3..eefb7ca7887a5d3c22003f9edf0176d834a3950f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * .cvsignore: Add fcntl_h.m4, getloadavg.m4, inttypes-h.m4,
+       inttypes-prio.m4, inttypes.m,4 isapipe.m4.
+
+       * jm-macros.m4 (gl_MACROS): Call cu_PREREQ_STAT_PROG rather
+       than AC_REQUIREing, so that sys/mount.h isn't tested for after
+       the test result.  I'm not sure why this fix is needed, but it
+       works.
+       * stat-prog.m4 (cu_PREREQ_STAT_PROG): Revamp to reflect better
+       what stat.c actually needs.
+
 2006-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * stat-prog.m4 (cu_PREREQ_STAT_PROG): Check for __val versus val

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 0b63c4641774699173ada5e321cbcc984172325d..e0188e66b4d13590889477d998bce24ad14e4ccb 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -79,7 +79,8 @@ AC_DEFUN([gl_MACROS],
     tcgetpgrp \
   )
 
-  AC_REQUIRE([cu_PREREQ_STAT_PROG])
+  dnl This can't use AC_REQUIRE; I'm not quite sure why.
+  cu_PREREQ_STAT_PROG
 
   # for dd.c and shred.c
   coreutils_saved_libs=$LIBS

diff --git a/m4/stat-prog.m4 b/m4/stat-prog.m4
index 7b003955883db0828544194e4eddc422b462e3e7..df9b40d5c7e3572be155a5ecc3b0ed6d3797ea7c 100644 (file)
--- a/m4/stat-prog.m4
+++ b/m4/stat-prog.m4
@@ -1,4 +1,4 @@
-# stat-prog.m4 serial 4
+# stat-prog.m4 serial 5
 # Record the prerequisites of src/stat.c from the coreutils package.
 
 # Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -21,59 +21,67 @@
 
 AC_DEFUN([cu_PREREQ_STAT_PROG],
 [
-  AC_CHECK_HEADERS_ONCE(sys/param.h sys/statvfs.h sys/vfs.h)
-  AC_CHECK_HEADERS(sys/mount.h, [], [],
-    [AC_INCLUDES_DEFAULT
-     [#if HAVE_SYS_PARAM_H
-       #include <sys/param.h>
-      #endif]])
+  AC_REQUIRE([gl_FSUSAGE])
+  AC_REQUIRE([gl_FSTYPENAME])
+  AC_CHECK_HEADERS_ONCE([OS.h netinet/in.h sys/param.h sys/vfs.h])
 
-  # For `struct statfs' on Ultrix 4.4.
-  AC_CHECK_HEADERS_ONCE([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h])
+  dnl Check for vfs.h first, since this avoids a warning with nfs_client.h
+  dnl on Solaris 8.
+  test $ac_cv_header_sys_param_h = yes &&
+  test $ac_cv_header_sys_mount_h = yes &&
+  AC_CHECK_HEADERS([nfs/vfs.h],
+    [AC_CHECK_HEADERS([nfs/nfs_client.h])])
 
-  statxfs_includes="\
-$ac_includes_default
-#if HAVE_SYS_STATVFS_H
-# include <sys/statvfs.h>
-#endif
+  statvfs_includes="\
+AC_INCLUDES_DEFAULT
+#include <sys/statvfs.h>
+"
+  statfs_includes="\
+AC_INCLUDES_DEFAULT
 #if HAVE_SYS_VFS_H
 # include <sys/vfs.h>
-#endif
-#if !HAVE_SYS_STATVFS_H && !HAVE_SYS_VFS_H
-# if HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H
-/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
-#  include <sys/param.h>
-#  include <sys/mount.h>
-# elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
-/* Ultrix 4.4 needs these for the declaration of struct statfs.  */
+#elif HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H
+# include <sys/param.h>
+# include <sys/mount.h>
+# if HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
 #  include <netinet/in.h>
 #  include <nfs/nfs_clnt.h>
 #  include <nfs/vfs.h>
 # endif
+#elif HAVE_OS_H
+# include <fs_info.h>
 #endif
 "
-  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes])
   dnl Keep this long conditional in sync with the USE_STATVFS conditional
   dnl in ../src/stat.c.
-  if test $ac_cv_header_sys_statvfs_h = yes &&
-    { AC_CHECK_MEMBERS(
-       [struct statvfs.f_basetype,
-        struct statvfs.f_fstypename,
-        struct statvfs.f_type],,,
-       [$statxfs_includes])
-      test $ac_cv_member_struct_statvfs_f_basetype = yes ||
-      test $ac_cv_member_struct_statvfs_f_fstypename = yes ||
-      { test $ac_cv_member_struct_statvfs_f_type = yes &&
-       test $ac_cv_member_struct_statfs_f_fstypename != yes; }; }; then
-    AC_CHECK_MEMBERS(
-      [struct statvfs.f_fsid.__val, struct statvfs.f_fsid.val,
-       struct statvfs.f_namelen, struct statvfs.f_namemax],,,
-      [$statxfs_includes])
+  if test "$fu_cv_sys_stat_statvfs" = yes &&
+     { AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [$statvfs_includes])
+       test $ac_cv_member_struct_statvfs_f_basetype = yes ||
+       { AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,, [$statvfs_includes])
+        test $ac_cv_member_struct_statvfs_f_fstypename = yes ||
+        { test $ac_cv_member_struct_statfs_f_fstypename != yes &&
+          { AC_CHECK_MEMBERS([struct statvfs.f_type],,, [$statvfs_includes])
+            test $ac_cv_member_struct_statvfs_f_type = yes; }; }; }; }
+  then
+    AC_CHECK_MEMBERS([struct statvfs.f_namemax],,, [$statvfs_includes])
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+        [$statvfs_includes],
+        [static statvfs s;
+         return (s.s_fsid ^ 0) == 0;])],
+      [AC_DEFINE([STRUCT_STATVFS_F_FSID_IS_INTEGER], 1,
+        [Define to 1 if the f_fsid member of struct statvfs is an integer.])])
   else
-    AC_CHECK_MEMBERS(
-      [struct statfs.f_basetype, struct statfs.f_fsid.__val,
-       struct statfs.f_fsid.val, struct statfs.f_namelen,
-       struct statfs.f_namemax, struct statfs.f_type],,,
-      [$statxfs_includes])
+    AC_CHECK_MEMBERS([struct statfs.f_namelen, struct statfs.f_type],,,
+      [$statfs_includes])
+    if test $ac_cv_header_OS_h != yes; then
+      AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [$statfs_includes],
+          [static statfs s;
+           return (s.s_fsid ^ 0) == 0;])],
+       [AC_DEFINE([STRUCT_STATFS_F_FSID_IS_INTEGER], 1,
+          [Define to 1 if the f_fsid member of struct statfs is an integer.])])
+    fi
   fi
 ])

diff --git a/src/stat.c b/src/stat.c
index dcd4aa0c540a7f9fdda75803c1e579fc1fc8d36d..08fed6df3912193ad4432100da455a5b2fcb9b92 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -29,6 +29,7 @@
 # define USE_STATVFS 0
 #endif
 
+#include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <pwd.h>
@@ -68,10 +69,11 @@
 #include "strftime.h"
 #include "xreadlink.h"
 
+#define alignof(type) offsetof (struct { char c; type x; }, x)
+
 #if USE_STATVFS
 # define STRUCT_STATVFS struct statvfs
-# define HAVE_STRUCT_STATXFS_F_FSID___VAL HAVE_STRUCT_STATVFS_F_FSID___VAL
-# define HAVE_STRUCT_STATXFS_F_FSID_VAL HAVE_STRUCT_STATVFS_F_FSID_VAL
+# define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER
 # define HAVE_STRUCT_STATXFS_F_TYPE HAVE_STRUCT_STATVFS_F_TYPE
 # if HAVE_STRUCT_STATVFS_F_NAMEMAX
 #  define SB_F_NAMEMAX(S) ((S)->f_namemax)
@@ -113,23 +115,15 @@ statfs (char const *filename, struct fs_info *buf)
 #  define f_files total_nodes
 #  define f_ffree free_nodes
 #  define STRUCT_STATVFS struct fs_info
-#  define HAVE_STRUCT_STATXFS_F_FSID___VAL 0
-#  define HAVE_STRUCT_STATXFS_F_FSID_VAL 0
+#  define STRUCT_STATXFS_F_FSID_IS_INTEGER true
 #  define STATFS_FRSIZE(S) ((S)->block_size)
 # else
 #  define STRUCT_STATVFS struct statfs
-#  define HAVE_STRUCT_STATXFS_F_FSID___VAL HAVE_STRUCT_STATFS_F_FSID___VAL
-#  define HAVE_STRUCT_STATXFS_F_FSID_VAL HAVE_STRUCT_STATFS_F_FSID_VAL
+#  define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATFS_F_FSID_IS_INTEGER
 #  define STATFS_FRSIZE(S) 0
 # endif
 #endif
 
-#if HAVE_STRUCT_STATXFS_F_FSID___VAL
-# define FSID_VAL __val
-#elif HAVE_STRUCT_STATXFS_F_FSID_VAL
-# define FSID_VAL val
-#endif
-
 #ifdef SB_F_NAMEMAX
 # define OUT_NAMEMAX out_uint
 #else
@@ -415,16 +409,22 @@ print_statfs (char *pformat, size_t prefix_len, char m, char const *filename,
 
     case 'i':
       {
-#ifdef FSID_VAL
-       uintmax_t val0 = statfsbuf->f_fsid.FSID_VAL[0];
-       uintmax_t val1 = statfsbuf->f_fsid.FSID_VAL[1];
-       uintmax_t fsid =
-         (val1
-          + (sizeof statfsbuf->f_fsid.FSID_VAL[1] < sizeof fsid
-             ? val0 << (CHAR_BIT * sizeof statfsbuf->f_fsid.FSID_VAL[1])
-             : 0));
-#else
+#if STRUCT_STATXFS_F_FSID_IS_INTEGER
        uintmax_t fsid = statfsbuf->f_fsid;
+#else
+       typedef unsigned int fsid_word;
+       verify (alignof (STRUCT_STATVFS) % alignof (fsid_word) == 0);
+       verify (offsetof (STRUCT_STATVFS, f_fsid) % alignof (fsid_word) == 0);
+       verify (sizeof statfsbuf->f_fsid % alignof (fsid_word) == 0);
+       fsid_word const *p = (fsid_word *) &statfsbuf->f_fsid;
+
+       /* Assume a little-endian word order, as that is compatible
+          with glibc's statvfs implementation.  */
+       uintmax_t fsid = 0;
+       int words = sizeof statfsbuf->f_fsid / sizeof *p;
+       int i;
+       for (i = 0; i < words && i * sizeof *p < sizeof fsid; i++)
+         fsid |= p[words - 1 - i] << (i * CHAR_BIT * sizeof *p);
 #endif
        out_uint_x (pformat, prefix_len, fsid);
       }