mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-24 21:01:20 +00:00
33 lines
1.2 KiB
C
33 lines
1.2 KiB
C
--- agent/mibgroup/ucd-snmp/disk.c.orig Mon Jul 8 11:37:20 2002
|
|
+++ agent/mibgroup/ucd-snmp/disk.c Thu Aug 29 11:08:39 2002
|
|
@@ -366,7 +366,7 @@
|
|
double totalblks, free, used, avail, availblks;
|
|
#else
|
|
static long avail;
|
|
-#ifdef STRUCT_STATVFS_HAS_F_FILES
|
|
+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
|
|
int percent_inode;
|
|
#endif
|
|
#endif
|
|
@@ -454,6 +454,11 @@
|
|
(double) (vfs.f_files -
|
|
(vfs.f_ffree - vfs.f_favail)) * 100.0 + 0.5);
|
|
#endif
|
|
+#if defined(HAVE_UFS_FFS_FS_H) && !defined(STRUCT_STATVFS_HAS_F_FILES)
|
|
+ percent_inode = vfs.f_files == 0 ? 100.0 :
|
|
+ (int) ((double) (vfs.f_files - vfs.f_ffree) /
|
|
+ (double) (vfs.f_files) * 100.0 + 0.5);
|
|
+#endif
|
|
switch (vp->magic) {
|
|
case DISKTOTAL:
|
|
long_ret = vfs.f_blocks * (vfs.f_bsize / 1024);
|
|
@@ -475,7 +480,7 @@
|
|
case DISKPERCENT:
|
|
long_ret = percent;
|
|
return ((u_char *) (&long_ret));
|
|
-#ifdef STRUCT_STATVFS_HAS_F_FILES
|
|
+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
|
|
case DISKPERCENTNODE:
|
|
long_ret = percent_inode;
|
|
return ((u_char *) (&long_ret));
|