X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Ffsusage.c;h=23d40ea1d1f62c1723b3e8e0ec3e97ebecc203e6;hb=56093e4d947bcc87bbc05ac3e8645509274f57b4;hp=16f0beddeb5a349ecbe3a95d79b30535cf6997ab;hpb=86e7bdec3d9214ec41dcba45c01ac860b3328091;p=gnulib.git
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 16f0bedde..23d40ea1d 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,10 +1,12 @@
-/* fsusage.c -- return space usage of mounted filesystems
- Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc.
+/* fsusage.c -- return space usage of mounted file systems
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,108 +14,114 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
-#if HAVE_INTTYPES_H
-# include
-#endif
-#include
-#include
#include "fsusage.h"
-int statfs ();
-
-#if HAVE_SYS_PARAM_H
-# include
-#endif
-
-#if HAVE_SYS_MOUNT_H
-# include
-#endif
-
-#if HAVE_SYS_VFS_H
-# include
-#endif
-
-#if HAVE_SYS_FS_S5PARAM_H /* Fujitsu UXP/V */
-# include
-#endif
-
-#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
-# include /* SVR2 */
-#endif
+#include
+#include
-#if HAVE_FCNTL_H
+#if STAT_STATVFS /* POSIX 1003.1-2001 (and later) with XSI */
+# include
+#else
+/* Don't include backward-compatibility files unless they're needed.
+ Eventually we'd like to remove all this cruft. */
# include
+# include
+# include
+# if HAVE_SYS_PARAM_H
+# include
+# endif
+# if HAVE_SYS_MOUNT_H
+# include
+# endif
+# if HAVE_SYS_VFS_H
+# include
+# endif
+# if HAVE_SYS_FS_S5PARAM_H /* Fujitsu UXP/V */
+# include
+# endif
+# if defined HAVE_SYS_FILSYS_H && !defined _CRAY
+# include /* SVR2 */
+# endif
+# if HAVE_SYS_STATFS_H
+# include
+# endif
+# if HAVE_DUSTAT_H /* AIX PS/2 */
+# include
+# endif
+# include "full-read.h"
#endif
-#if HAVE_SYS_STATFS_H
-# include
-#endif
-
-#if HAVE_DUSTAT_H /* AIX PS/2 */
-# include
-#endif
-
-#if HAVE_SYS_STATVFS_H /* SVR4 */
-# include
-int statvfs ();
-#endif
+/* The results of open() in this file are not used with fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef open
+#undef close
/* Many space usage primitives use all 1 bits to denote a value that is
not applicable or unknown. Propagate this information by returning
- a uintmax_t value that is all 1 bits if the argument is all 1 bits,
- even if the argument is unsigned and smaller than unitmax_t. */
-#define PROPAGATE_ALL_ONES(x) ((x) == -1 ? (uintmax_t) -1 : (uintmax_t) (x))
-
-int safe_read ();
+ a uintmax_t value that is all 1 bits if X is all 1 bits, even if X
+ is unsigned and narrower than uintmax_t. */
+#define PROPAGATE_ALL_ONES(x) \
+ ((sizeof (x) < sizeof (uintmax_t) \
+ && (~ (x) == (sizeof (x) < sizeof (int) \
+ ? - (1 << (sizeof (x) * CHAR_BIT)) \
+ : 0))) \
+ ? UINTMAX_MAX : (uintmax_t) (x))
+
+/* Extract the top bit of X as an uintmax_t value. */
+#define EXTRACT_TOP_BIT(x) ((x) \
+ & ((uintmax_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
+
+/* If a value is negative, many space usage primitives store it into an
+ integer variable by assignment, even if the variable's type is unsigned.
+ So, if a space usage variable X's top bit is set, convert X to the
+ uintmax_t value V such that (- (uintmax_t) V) is the negative of
+ the original value. If X's top bit is clear, just yield X.
+ Use PROPAGATE_TOP_BIT if the original value might be negative;
+ otherwise, use PROPAGATE_ALL_ONES. */
+#define PROPAGATE_TOP_BIT(x) ((x) | ~ (EXTRACT_TOP_BIT (x) - 1))
/* Fill in the fields of FSP with information about space usage for
- the filesystem on which PATH resides.
- DISK is the device on which PATH is mounted, for space-getting
+ the file system on which FILE resides.
+ DISK is the device on which FILE is mounted, for space-getting
methods that need to know it.
Return 0 if successful, -1 if not. When returning -1, ensure that
ERRNO is either a system error value, or zero if DISK is NULL
on a system that requires a non-NULL value. */
int
-get_fs_usage (path, disk, fsp)
- const char *path;
- const char *disk;
- struct fs_usage *fsp;
+get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
{
-#ifdef STAT_STATFS3_OSF1
+#if defined STAT_STATVFS /* POSIX */
- struct statfs fsd;
+ struct statvfs fsd;
- if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
+ if (statvfs (file, &fsd) < 0)
return -1;
- fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-
-#endif /* STAT_STATFS3_OSF1 */
+ /* f_frsize isn't guaranteed to be supported. */
+ fsp->fsu_blocksize = (fsd.f_frsize
+ ? PROPAGATE_ALL_ONES (fsd.f_frsize)
+ : PROPAGATE_ALL_ONES (fsd.f_bsize));
-#ifdef STAT_STATFS2_FS_DATA /* Ultrix */
+#elif defined STAT_STATFS2_FS_DATA /* Ultrix */
struct fs_data fsd;
- if (statfs (path, &fsd) != 1)
+ if (statfs (file, &fsd) != 1)
return -1;
fsp->fsu_blocksize = 1024;
fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot);
fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree);
- fsp->fsu_bavail = PROPAGATE_ALL_ONES (fsd.fd_req.bfreen);
+ fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen);
+ fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0;
fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot);
fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree);
-#endif /* STAT_STATFS2_FS_DATA */
-
-#ifdef STAT_READ_FILSYS /* SVR2 */
+#elif defined STAT_READ_FILSYS /* SVR2 */
# ifndef SUPERBOFF
# define SUPERBOFF (SUPERB * 512)
# endif
@@ -131,29 +139,37 @@ get_fs_usage (path, disk, fsp)
if (fd < 0)
return -1;
lseek (fd, (off_t) SUPERBOFF, 0);
- if (safe_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
+ if (full_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
{
close (fd);
return -1;
}
close (fd);
- fsp->fsu_blocksize = fsd.s_type == Fs2b ? 1024 : 512;
+ fsp->fsu_blocksize = (fsd.s_type == Fs2b ? 1024 : 512);
fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.s_fsize);
fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.s_tfree);
- fsp->fsu_bavail = PROPAGATE_ALL_ONES (fsd.s_tfree);
+ fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.s_tfree);
+ fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.s_tfree) != 0;
fsp->fsu_files = (fsd.s_isize == -1
- ? (uintmax_t) -1
+ ? UINTMAX_MAX
: (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1));
fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.s_tinode);
-#endif /* STAT_READ_FILSYS */
+#elif defined STAT_STATFS3_OSF1
+
+ struct statfs fsd;
-#ifdef STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX */
+ if (statfs (file, &fsd, sizeof (struct statfs)) != 0)
+ return -1;
+
+ fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
+
+#elif defined STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX */
struct statfs fsd;
- if (statfs (path, &fsd) < 0)
+ if (statfs (file, &fsd) < 0)
return -1;
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
@@ -165,7 +181,7 @@ get_fs_usage (path, disk, fsp)
truncation, presumably without botching the 4.1.1 case, in which
the values are not truncated. The correct counts are stored in
undocumented spare fields. */
- if (fsd.f_blocks == 0x1fffff && fsd.f_spare[0] > 0)
+ if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0)
{
fsd.f_blocks = fsd.f_spare[0];
fsd.f_bfree = fsd.f_spare[1];
@@ -173,20 +189,16 @@ get_fs_usage (path, disk, fsp)
}
# endif /* STATFS_TRUNCATES_BLOCK_COUNTS */
-#endif /* STAT_STATFS2_BSIZE */
-
-#ifdef STAT_STATFS2_FSIZE /* 4.4BSD */
+#elif defined STAT_STATFS2_FSIZE /* 4.4BSD */
struct statfs fsd;
- if (statfs (path, &fsd) < 0)
+ if (statfs (file, &fsd) < 0)
return -1;
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-#endif /* STAT_STATFS2_FSIZE */
-
-#ifdef STAT_STATFS4 /* SVR3, Dynix, Irix, AIX */
+#elif defined STAT_STATFS4 /* SVR3, Dynix, Irix, AIX */
# if !_AIX && !defined _SEQUENT_ && !defined DOLPHIN
# define f_bavail f_bfree
@@ -194,59 +206,45 @@ get_fs_usage (path, disk, fsp)
struct statfs fsd;
- if (statfs (path, &fsd, sizeof fsd, 0) < 0)
+ if (statfs (file, &fsd, sizeof fsd, 0) < 0)
return -1;
/* 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. */
-# if _AIX || defined(_CRAY)
+# if _AIX || defined _CRAY
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
# else
fsp->fsu_blocksize = 512;
# endif
-#endif /* STAT_STATFS4 */
-
-#ifdef STAT_STATVFS /* SVR4 */
-
- struct statvfs fsd;
-
- if (statvfs (path, &fsd) < 0)
- return -1;
-
- /* f_frsize isn't guaranteed to be supported. */
- fsp->fsu_blocksize =
- PROPAGATE_ALL_ONES (fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize);
-
-#endif /* STAT_STATVFS */
+#endif
-#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS)
- /* !Ultrix && !SVR2 */
+#if (defined STAT_STATVFS \
+ || (!defined STAT_STATFS2_FS_DATA && !defined STAT_READ_FILSYS))
fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks);
fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree);
- fsp->fsu_bavail = PROPAGATE_ALL_ONES (fsd.f_bavail);
+ fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.f_bavail);
+ fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0;
fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.f_files);
fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.f_ffree);
-#endif /* not STAT_STATFS2_FS_DATA && not STAT_READ_FILSYS */
+#endif
return 0;
}
-#if defined(_AIX) && defined(_I386)
+#if defined _AIX && defined _I386
/* AIX PS/2 does not supply statfs. */
int
-statfs (path, fsb)
- char *path;
- struct statfs *fsb;
+statfs (char *file, struct statfs *fsb)
{
struct stat stats;
struct dustat fsd;
- if (stat (path, &stats))
+ if (stat (file, &stats) != 0)
return -1;
if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd)))
return -1;