#endif
#include <sys/types.h>
+#include <sys/stat.h>
#include "fsusage.h"
-#include "safe-stat.h"
int statfs ();
#endif
#ifdef HAVE_DUSTAT_H /* AIX PS/2. */
-#include <sys/stat.h>
#include <sys/dustat.h>
#endif
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. */
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;
#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)
/* 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)
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;