X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=23d40ea1d1f62c1723b3e8e0ec3e97ebecc203e6;hb=1eb850a182e6e5aa66d17d314b394e2ded30e2b5;hp=972d88f122c0ccd9bed7a862ee9a91a4969e72bd;hpb=359c0a71713e606f440d40f55a43c77349df2aaa;p=gnulib.git
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 972d88f12..23d40ea1d 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,12 +1,12 @@
/* fsusage.c -- return space usage of mounted file systems
- Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003, 2004, 2005
+ 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
+ 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
@@ -14,69 +14,51 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
-#if HAVE_INTTYPES_H
-# include
-#endif
-#if HAVE_STDINT_H
-# include
-#endif
-#if HAVE_UNISTD_H
-# include
-#endif
-#ifndef UINTMAX_MAX
-# define UINTMAX_MAX ((uintmax_t) -1)
-#endif
-
-#include
-#include
#include "fsusage.h"
#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_FCNTL_H
-# include
-#endif
-
-#if HAVE_SYS_STATFS_H
-# include
-#endif
-
-#if HAVE_DUSTAT_H /* AIX PS/2 */
-# include
-#endif
-
-#if HAVE_SYS_STATVFS_H /* SVR4 */
+#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
-#include "full-read.h"
+/* 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
@@ -87,7 +69,7 @@
&& (~ (x) == (sizeof (x) < sizeof (int) \
? - (1 << (sizeof (x) * CHAR_BIT)) \
: 0))) \
- ? UINTMAX_MAX : (x))
+ ? UINTMAX_MAX : (uintmax_t) (x))
/* Extract the top bit of X as an uintmax_t value. */
#define EXTRACT_TOP_BIT(x) ((x) \
@@ -112,18 +94,19 @@
int
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 (file, &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;
@@ -138,9 +121,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
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
@@ -175,9 +156,16 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
: (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;
+
+ if (statfs (file, &fsd, sizeof (struct statfs)) != 0)
+ return -1;
+
+ fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-#ifdef STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX */
+#elif defined STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX */
struct statfs fsd;
@@ -201,9 +189,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *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;
@@ -212,9 +198,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
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
@@ -234,24 +218,10 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
fsp->fsu_blocksize = 512;
# endif
-#endif /* STAT_STATFS4 */
-
-#ifdef STAT_STATVFS /* SVR4 */
-
- struct statvfs fsd;
-
- if (statvfs (file, &fsd) < 0)
- return -1;
-
- /* 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));
-
-#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);
@@ -260,7 +230,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
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;
}