>From 8b93fddaac5543c03b40ea0887127939be99e8a5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 16 Oct 2018 20:43:03 +0200 Subject: [PATCH 07/13] fsusage, stat-size, getloadavg: Remove support for AIX PS/2. * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Don't check for dustat.h. * lib/fsusage.c: Remove code for AIX PS/2. * lib/stat-size.h (ST_NBLOCKSIZE): Likewise. * lib/getloadavg.c: Likewise. --- ChangeLog | 8 ++++++++ lib/fsusage.c | 30 ------------------------------ lib/getloadavg.c | 2 +- lib/stat-size.h | 9 ++------- m4/fsusage.m4 | 4 ++-- 5 files changed, 13 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97f6c1d..21127ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2018-10-16 Bruno Haible + fsusage, stat-size, getloadavg: Remove support for AIX PS/2. + * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Don't check for dustat.h. + * lib/fsusage.c: Remove code for AIX PS/2. + * lib/stat-size.h (ST_NBLOCKSIZE): Likewise. + * lib/getloadavg.c: Likewise. + +2018-10-16 Bruno Haible + getloadavg: Remove support for HP-UX on m68k. * lib/getloadavg.c: Remove hp9000s300 case. diff --git a/lib/fsusage.c b/lib/fsusage.c index 23cb12a..8431f20 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -46,9 +46,6 @@ # if HAVE_SYS_STATFS_H # include # endif -# if HAVE_DUSTAT_H /* AIX PS/2 */ -# include -# endif #endif /* Many space usage primitives use all 1 bits to denote a value that is @@ -257,30 +254,3 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) (void) disk; /* avoid argument-unused warning */ return 0; } - -#if defined _AIX && defined _I386 -/* AIX PS/2 does not supply statfs. */ - -int -statfs (char *file, struct statfs *fsb) -{ - struct stat stats; - struct dustat fsd; - - if (stat (file, &stats) != 0) - return -1; - if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd))) - return -1; - fsb->f_type = 0; - fsb->f_bsize = fsd.du_bsize; - fsb->f_blocks = fsd.du_fsize - fsd.du_isize; - fsb->f_bfree = fsd.du_tfree; - fsb->f_bavail = fsd.du_tfree; - fsb->f_files = (fsd.du_isize - 2) * fsd.du_inopb; - fsb->f_ffree = fsd.du_tinode; - fsb->f_fsid.val[0] = fsd.du_site; - fsb->f_fsid.val[1] = fsd.du_pckno; - return 0; -} - -#endif /* _AIX && _I386 */ diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 943a826..30faf6d 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -883,7 +883,7 @@ getloadavg (double loadavg[], int nelem) # ifndef SUNOS_5 if ( -# if !(defined (_AIX) && !defined (ps2)) +# if !defined (_AIX) nlist (KERNEL_FILE, name_list) # else /* _AIX */ knlist (name_list, 1, sizeof (name_list[0])) diff --git a/lib/stat-size.h b/lib/stat-size.h index 6d402fe..7fa4451 100644 --- a/lib/stat-size.h +++ b/lib/stat-size.h @@ -79,15 +79,10 @@ This loses when mixing HP-UX and BSD file systems with NFS. */ # define ST_NBLOCKSIZE 1024 # else /* !hpux */ -# if defined _AIX && defined _I386 - /* AIX PS/2 counts st_blocks in 4K units. */ -# define ST_NBLOCKSIZE (4 * 1024) -# else -# if defined _CRAY -# define ST_NBLOCKS(statbuf) \ +# if defined _CRAY +# define ST_NBLOCKS(statbuf) \ (S_ISREG ((statbuf).st_mode) || S_ISDIR ((statbuf).st_mode) \ ? (statbuf).st_blocks * ST_BLKSIZE (statbuf) / ST_NBLOCKSIZE : 0) -# endif # endif # endif #endif diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index f94f829..6f6e9cd 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -199,7 +199,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; ac_fsusage_space=yes AC_DEFINE([STAT_STATFS2_BSIZE], [1], [Define if statfs takes 2 args and struct statfs has a field named f_bsize. - (4.3BSD, SunOS 4, HP-UX, AIX PS/2)]) + (4.3BSD, SunOS 4, HP-UX)]) fi fi @@ -337,6 +337,6 @@ choke -- this is a workaround for a Sun-specific problem # Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE. AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ - AC_CHECK_HEADERS([dustat.h sys/fs/s5param.h sys/statfs.h]) + AC_CHECK_HEADERS([sys/fs/s5param.h sys/statfs.h]) gl_STATFS_TRUNCATES ]) -- 2.7.4