X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=f326c37592fdd1d99d67b84989163b29bc27411a;hb=9d6849241fce59b8c781e0d22de2f1518355af77;hp=99dcbc3c2532c2a3bc5dd55f59b2cccbda6a1633;hpb=e0be8461f5acc1b0b11684deb224a48e4bd96eb9;p=gnulib.git diff --git a/lib/fsusage.c b/lib/fsusage.c index 99dcbc3c2..f326c3759 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -16,66 +16,63 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif #endif #include #include "fsusage.h" +#include "safe-stat.h" int statfs (); -#if defined (STAT_STATFS3_OSF1) /* DEC Alpha running OSF/1 */ -# include +#ifdef HAVE_SYS_PARAM_H +#include #endif -#if defined(STAT_STATFS2_BSIZE) && !defined(_IBMR2) /* 4.3BSD, SunOS 4, HP-UX, AIX PS/2. */ -#include +#ifdef HAVE_SYS_MOUNT_H +#include #endif -#ifdef STAT_STATFS2_FSIZE /* 4.4BSD. */ -#include +#ifdef HAVE_SYS_VFS_H +#include #endif -#ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ -#include -#include +#ifdef HAVE_SYS_FILSYS_H +#include /* SVR2. */ #endif -#ifdef STAT_READ /* SVR2. */ -#include -#include +#ifdef HAVE_FCNTL_H #include #endif -#if defined(STAT_STATFS4) || (defined(_AIX) && defined(_IBMR2)) /* SVR3, Dynix, Irix, AIX RS6000. */ +#ifdef HAVE_SYS_STATFS_H #include #endif -#if defined(_AIX) && defined(_I386) /* AIX PS/2. */ +#ifdef HAVE_DUSTAT_H /* AIX PS/2. */ #include #include #endif -#ifdef STAT_STATVFS /* SVR4. */ +#ifdef HAVE_SYS_STATVFS_H /* SVR4. */ #include int statvfs (); #endif /* Return the number of TOSIZE-byte blocks used by - BLOCKS FROMSIZE-byte blocks, rounding away from zero. */ + BLOCKS FROMSIZE-byte blocks, rounding away from zero. + TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */ static long adjust_blocks (blocks, fromsize, tosize) long blocks; int fromsize, tosize; { + if (tosize <= 0) + abort (); + if (fromsize <= 0) + return -1; + if (fromsize == tosize) /* E.g., from 512 to 512. */ return blocks; else if (fromsize > tosize) /* E.g., from 2048 to 512. */ @@ -99,8 +96,8 @@ get_fs_usage (path, disk, fsp) struct statfs fsd; if (statfs (path, &fsd, sizeof (struct statfs)) != 0) - return (-1); -#define convert_blocks(b) adjust_blocks ((b), fsd.f_fsize, 512) + return -1; +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512) #endif /* STAT_STATFS3_OSF1 */ #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ @@ -108,15 +105,15 @@ get_fs_usage (path, disk, fsp) if (statfs (path, &fsd) != 1) return -1; -#define convert_blocks(b) adjust_blocks ((b), 1024, 512) - fsp->fsu_blocks = convert_blocks (fsd.fd_req.btot); - fsp->fsu_bfree = convert_blocks (fsd.fd_req.bfree); - fsp->fsu_bavail = convert_blocks (fsd.fd_req.bfreen); +#define CONVERT_BLOCKS(b) adjust_blocks ((b), 1024, 512) + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen); fsp->fsu_files = fsd.fd_req.gtot; fsp->fsu_ffree = fsd.fd_req.gfree; #endif -#ifdef STAT_READ /* SVR2. */ +#ifdef STAT_READ_FILSYS /* SVR2. */ #ifndef SUPERBOFF #define SUPERBOFF (SUPERB * 512) #endif @@ -133,11 +130,10 @@ get_fs_usage (path, disk, fsp) return -1; } close (fd); -#define convert_blocks(b) \ - adjust_blocks ((b), (fsd.s_type == Fs2b ? 1024 : 512), 512) - fsp->fsu_blocks = convert_blocks (fsd.s_fsize); - fsp->fsu_bfree = convert_blocks (fsd.s_tfree); - fsp->fsu_bavail = convert_blocks (fsd.s_tfree); +#define CONVERT_BLOCKS(b) adjust_blocks ((b), (fsd.s_type == Fs2b ? 1024 : 512), 512) + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.s_fsize); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.s_tfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.s_tfree); fsp->fsu_files = (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1); fsp->fsu_ffree = fsd.s_tinode; #endif @@ -147,7 +143,7 @@ get_fs_usage (path, disk, fsp) if (statfs (path, &fsd) < 0) return -1; -#define convert_blocks(b) adjust_blocks ((b), fsd.f_bsize, 512) +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512) #endif #ifdef STAT_STATFS2_FSIZE /* 4.4BSD. */ @@ -155,7 +151,7 @@ get_fs_usage (path, disk, fsp) if (statfs (path, &fsd) < 0) return -1; -#define convert_blocks(b) adjust_blocks ((b), fsd.f_fsize, 512) +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512) #endif #ifdef STAT_STATFS4 /* SVR3, Dynix, Irix. */ @@ -166,7 +162,7 @@ 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) +#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 @@ -180,14 +176,14 @@ get_fs_usage (path, disk, fsp) if (statvfs (path, &fsd) < 0) return -1; /* f_frsize isn't guaranteed to be supported. */ -#define convert_blocks(b) \ +#define CONVERT_BLOCKS(b) \ adjust_blocks ((b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512) #endif -#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ) /* !Ultrix && !SVR2. */ - fsp->fsu_blocks = convert_blocks (fsd.f_blocks); - fsp->fsu_bfree = convert_blocks (fsd.f_bfree); - fsp->fsu_bavail = convert_blocks (fsd.f_bavail); +#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2. */ + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail); fsp->fsu_files = fsd.f_files; fsp->fsu_ffree = fsd.f_ffree; #endif @@ -206,7 +202,7 @@ statfs (path, fsb) struct stat stats; struct dustat fsd; - if (stat (path, &stats)) + if (SAFE_STAT (path, &stats)) return -1; if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd))) return -1;