>From 43a8882ec0a98e43c78e7d2612fb133f10bb2810 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 16 Oct 2018 21:02:51 +0200 Subject: [PATCH 09/13] fsusage, mountlist, getloadavg: Remove support for Dynix/ptx. * lib/fsusage.c: Remove _SEQUENT_ case. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. * lib/mountlist.c: Don't test for MNTTABNAME. * m4/ls-mntd-fs.m4 (AC_FUNC_GETMNTENT): Don't test for libseq. (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't test for MNTTABNAME. * lib/getloadavg.c: Remove _SEQUENT_ and sequent cases. * lib/stat-size.h: Don't mention the Sequent bug. * doc/posix-functions/utime.texi: Don't mention the Dynix bug. --- ChangeLog | 12 ++++++++++++ doc/posix-functions/utime.texi | 3 --- lib/fsusage.c | 6 +----- lib/getloadavg.c | 20 +++----------------- lib/mountlist.c | 7 ++----- lib/stat-size.h | 3 +-- m4/fsusage.m4 | 2 +- m4/ls-mntd-fs.m4 | 11 ++++------- 8 files changed, 24 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6411e72..10a9914 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2018-10-16 Bruno Haible + fsusage, mountlist, getloadavg: Remove support for Dynix/ptx. + * lib/fsusage.c: Remove _SEQUENT_ case. + * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. + * lib/mountlist.c: Don't test for MNTTABNAME. + * m4/ls-mntd-fs.m4 (AC_FUNC_GETMNTENT): Don't test for libseq. + (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't test for MNTTABNAME. + * lib/getloadavg.c: Remove _SEQUENT_ and sequent cases. + * lib/stat-size.h: Don't mention the Sequent bug. + * doc/posix-functions/utime.texi: Don't mention the Dynix bug. + +2018-10-16 Bruno Haible + fsusage: Remove support for AIX 3. * lib/fsusage.c: Remove code for AIX 3. * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. diff --git a/doc/posix-functions/utime.texi b/doc/posix-functions/utime.texi index 23c74d1..e295690 100644 --- a/doc/posix-functions/utime.texi +++ b/doc/posix-functions/utime.texi @@ -21,9 +21,6 @@ mingw, MSVC 14. Portability problems not fixed by Gnulib: @itemize @item -On some old platforms (Sequent), @code{utime (file, NULL)} fails to set the -file's timestamp to the current time. address@hidden On some platforms, this function mis-handles trailing slash: Solaris 9. @item diff --git a/lib/fsusage.c b/lib/fsusage.c index 2a69022..e33152a 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -216,11 +216,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); -#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix */ - -# if !defined _SEQUENT_ -# define f_bavail f_bfree -# endif +#elif defined STAT_STATFS4 /* SVR3, old Irix */ struct statfs fsd; diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 30faf6d..0532e1b 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -62,8 +62,6 @@ __MSDOS__ No-op for MSDOS. NeXT sgi - sequent Sequent Dynix 3.x.x (BSD) - _SEQUENT_ Sequent DYNIX/ptx 1.x.x (SYSV) sony_news NEWS-OS (works at least for 4.1C) UMAX UMAX4_3 @@ -188,10 +186,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef _SEQUENT_ -# define LOAD_AVE_TYPE long -# endif - # ifdef sgi # define LOAD_AVE_TYPE long # endif @@ -204,10 +198,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef sequent -# define LOAD_AVE_TYPE long -# endif - # ifdef OSF_ALPHA # define LOAD_AVE_TYPE long # endif @@ -245,7 +235,7 @@ # define FSCALE 256 # endif -# if defined (sgi) || defined (sequent) +# if defined (sgi) /* Sometimes both MIPS and sgi are defined, so FSCALE was just defined above under #ifdef MIPS. But we want the sgi value. */ # undef FSCALE @@ -273,20 +263,16 @@ # endif -# if !defined (KERNEL_FILE) && defined (sequent) -# define KERNEL_FILE "/dynix" -# endif - # if !defined (KERNEL_FILE) && defined (hpux) # define KERNEL_FILE "/hp-ux" # endif -# if !defined (KERNEL_FILE) && (defined (_SEQUENT_) || defined (MIPS) || defined (SVR4) || defined (ISC) || defined (sgi)) +# if !defined (KERNEL_FILE) && (defined (MIPS) || defined (SVR4) || defined (ISC) || defined (sgi)) # define KERNEL_FILE "/unix" # endif -# if !defined (LDAV_SYMBOL) && (defined (hpux) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) +# if !defined (LDAV_SYMBOL) && (defined (hpux) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) # define LDAV_SYMBOL "avenrun" # endif diff --git a/lib/mountlist.c b/lib/mountlist.c index d655d95..01ad309 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -63,7 +63,7 @@ #endif /* MOUNTED_GETFSSTAT */ #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, - also (obsolete) 4.3BSD, SunOS, Dynix */ + also (obsolete) 4.3BSD, SunOS */ # include # include # if !defined MOUNTED @@ -73,9 +73,6 @@ # if defined MNT_MNTTAB /* HP-UX. */ # define MOUNTED MNT_MNTTAB # endif -# if defined MNTTABNAME /* Dynix. */ -# define MOUNTED MNTTABNAME -# endif # endif #endif @@ -463,7 +460,7 @@ read_file_system_list (bool need_fs_type) #endif #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, - also (obsolete) 4.3BSD, SunOS, Dynix */ + also (obsolete) 4.3BSD, SunOS */ { FILE *fp; diff --git a/lib/stat-size.h b/lib/stat-size.h index 7fa4451..68ce3cd 100644 --- a/lib/stat-size.h +++ b/lib/stat-size.h @@ -62,8 +62,7 @@ st_blocks ((statbuf).st_size) : 0) # endif #else -/* Some systems, like Sequents, return st_blksize of 0 on pipes. - Also, when running 'rsh hpux11-system cat any-file', cat would +/* When running 'rsh hpux11-system cat any-file', cat would determine that the output stream had an st_blksize of 2147421096. Conversely st_blksize can be 2 GiB (or maybe even larger) with XFS on 64-bit hosts. Somewhat arbitrarily, limit the "optimal" block diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index 56ac473..96378ba 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -224,7 +224,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; if test $fu_cv_sys_stat_statfs4 = yes; then ac_fsusage_space=yes AC_DEFINE([STAT_STATFS4], [1], - [Define if statfs takes 4 args. (SVR3, Dynix, old Irix)]) + [Define if statfs takes 4 args. (SVR3, old Irix)]) fi fi diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 22abe4d..64a2dfc 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -19,8 +19,8 @@ dnl AC_DEFUN([AC_FUNC_GETMNTENT], [ # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, - # -lseq on Dynix/PTX, -lgen on Unixware. - AC_SEARCH_LIBS([getmntent], [sun seq gen]) + # -lgen on Unixware. + AC_SEARCH_LIBS([getmntent], [sun gen]) AC_CHECK_FUNCS([getmntent]) ]) @@ -120,7 +120,7 @@ yes # Determine whether it's the one-argument variant or the two-argument one. if test -z "$ac_list_mounted_fs"; then - # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS, Dynix. + # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS. AC_CACHE_CHECK([for one-argument getmntent function], [fu_cv_sys_mounted_getmntent1], [AC_COMPILE_IFELSE( @@ -136,9 +136,6 @@ yes # if defined MNT_MNTTAB /* HP-UX. */ # define MOUNTED MNT_MNTTAB # endif -# if defined MNTTABNAME /* Dynix. */ -# define MOUNTED MNTTABNAME -# endif #endif ]], [[struct mntent *mnt = 0; char *table = MOUNTED; @@ -152,7 +149,7 @@ yes AC_DEFINE([MOUNTED_GETMNTENT1], [1], [Define if there is a function named getmntent for reading the list of mounted file systems, and that function takes a single argument. - (4.3BSD, SunOS, HP-UX, Dynix, Irix)]) + (4.3BSD, SunOS, HP-UX, Irix)]) AC_CHECK_FUNCS([hasmntopt]) fi fi -- 2.7.4