projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with 1.8.1c
[gnulib.git]
/
lib
/
fsusage.c
diff --git
a/lib/fsusage.c
b/lib/fsusage.c
index
b434913
..
7f7a4a7
100644
(file)
--- a/
lib/fsusage.c
+++ b/
lib/fsusage.c
@@
-15,11
+15,26
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+ using -I. -I will use ./config.h rather than /config.h
+ (which it would do because it found this file in ). */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
#include <sys/types.h>
#include "fsusage.h"
int statfs ();
#include <sys/types.h>
#include "fsusage.h"
int statfs ();
+#if defined (STAT_STATFS3_OSF1) /* DEC Alpha running OSF/1 */
+# include <sys/mount.h>
+#endif
+
#if defined(STAT_STATFS2_BSIZE) && !defined(_IBMR2) /* 4.3BSD, SunOS 4, HP-UX, AIX PS/2. */
#include <sys/vfs.h>
#endif
#if defined(STAT_STATFS2_BSIZE) && !defined(_IBMR2) /* 4.3BSD, SunOS 4, HP-UX, AIX PS/2. */
#include <sys/vfs.h>
#endif
@@
-54,7
+69,7
@@
int statvfs ();
#endif
/* Return the number of TOSIZE-byte blocks used by
#endif
/* Return the number of TOSIZE-byte blocks used by
- BLOCKS FROMSIZE-byte blocks, rounding
up
. */
+ BLOCKS FROMSIZE-byte blocks, rounding
away from zero
. */
static long
adjust_blocks (blocks, fromsize, tosize)
static long
adjust_blocks (blocks, fromsize, tosize)
@@
-66,7
+81,7
@@
adjust_blocks (blocks, fromsize, tosize)
else if (fromsize > tosize) /* E.g., from 2048 to 512. */
return blocks * (fromsize / tosize);
else /* E.g., from 256 to 512. */
else if (fromsize > tosize) /* E.g., from 2048 to 512. */
return blocks * (fromsize / tosize);
else /* E.g., from 256 to 512. */
- return (blocks +
1
) / (tosize / fromsize);
+ return (blocks +
(blocks < 0 ? -1 : 1)
) / (tosize / fromsize);
}
/* Fill in the fields of FSP with information about space usage for
}
/* Fill in the fields of FSP with information about space usage for
@@
-80,6
+95,14
@@
get_fs_usage (path, disk, fsp)
char *path, *disk;
struct fs_usage *fsp;
{
char *path, *disk;
struct fs_usage *fsp;
{
+#if defined (STAT_STATFS3_OSF1)
+ struct statfs fsd;
+
+ if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
+ return (-1);
+#define convert_blocks(b) adjust_blocks ((b),fsd.f_fsize, 512)
+#endif /* STAT_STATFS3_OSF1 */
+
#ifdef STAT_STATFS2_FS_DATA /* Ultrix. */
struct fs_data fsd;
#ifdef STAT_STATFS2_FS_DATA /* Ultrix. */
struct fs_data fsd;
@@
-144,9
+167,11
@@
get_fs_usage (path, disk, fsp)
no matter what value f_bsize has. */
#define convert_blocks(b) (b)
#ifndef _SEQUENT_ /* _SEQUENT_ is DYNIX/ptx. */
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
#define f_bavail f_bfree
#endif
#endif
+#endif
#ifdef STAT_STATVFS /* SVR4. */
struct statvfs fsd;
#ifdef STAT_STATVFS /* SVR4. */
struct statvfs fsd;