X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=82bdd19702d083307fcaa12fbda1908b5acbcd52;hb=63f4e38fff9d2458d63ead4a769cfd3dd3e99490;hp=503b3875ecd69ce210532ad68a9e716a20bf0365;hpb=2f17b5a85fb0021903daea2f4cc0026507e114f2;p=gnulib.git

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 503b3875e..82bdd1970 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include "fsusage.h"
 #include "safe-stat.h"
 
@@ -50,7 +51,6 @@ int statfs ();
 #endif
 
 #ifdef HAVE_DUSTAT_H		/* AIX PS/2.  */
-#include <sys/stat.h>
 #include <sys/dustat.h>
 #endif
 
@@ -59,6 +59,8 @@ int statfs ();
 int statvfs ();
 #endif
 
+int safe_read ();
+
 /* Return the number of TOSIZE-byte blocks used by
    BLOCKS FROMSIZE-byte blocks, rounding away from zero.
    TOSIZE must be positive.  Return -1 if FROMSIZE is not positive.  */
@@ -124,7 +126,7 @@ get_fs_usage (path, disk, fsp)
   if (fd < 0)
     return -1;
   lseek (fd, (long) SUPERBOFF, 0);
-  if (read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
+  if (safe_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
     {
       close (fd);
       return -1;
@@ -154,7 +156,7 @@ get_fs_usage (path, disk, fsp)
 #define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512)
 #endif
 
-#ifdef STAT_STATFS4		/* SVR3, Dynix, Irix.  */
+#ifdef STAT_STATFS4		/* SVR3, Dynix, Irix, AIX.  */
   struct statfs fsd;
 
   if (statfs (path, &fsd, sizeof fsd, 0) < 0)
@@ -162,15 +164,19 @@ get_fs_usage (path, disk, fsp)
   /* Empirically, the block counts on most SVR3 and SVR3-derived
      systems seem to always be in terms of 512-byte blocks,
      no matter what value f_bsize has.  */
-#define CONVERT_BLOCKS(b) (b)
-#ifndef _SEQUENT_		/* _SEQUENT_ is DYNIX/ptx.  */
-#ifndef DOLPHIN			/* DOLPHIN 3.8.alfa/7.18 has f_bavail */
-#define f_bavail f_bfree
-#endif
-#endif
-#endif
-
-#ifdef HAVE_SYS_STATVFS_H	/* SVR4.  */
+# if _AIX
+#  define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512)
+# else
+#  define CONVERT_BLOCKS(b) (b)
+#  ifndef _SEQUENT_		/* _SEQUENT_ is DYNIX/ptx.  */
+#   ifndef DOLPHIN		/* DOLPHIN 3.8.alfa/7.18 has f_bavail */
+#    define f_bavail f_bfree
+#   endif
+#  endif
+# endif
+#endif
+
+#ifdef STAT_STATVFS		/* SVR4.  */
   struct statvfs fsd;
 
   if (statvfs (path, &fsd) < 0)
@@ -202,7 +208,7 @@ statfs (path, fsb)
   struct stat stats;
   struct dustat fsd;
 
-  if (SAFE_STAT (path, &stats))
+  if (stat (path, &stats))
     return -1;
   if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd)))
     return -1;