Here are the proposed patches.
2018-10-16 Bruno Haible <[email protected]> mountlist: Remove support for Cray with UNICOS 9. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_LISTMNTENT. * lib/mountlist.c: Remove MOUNTED_LISTMNTENT case. 2018-10-16 Bruno Haible <[email protected]> fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define STAT_STATFS2_FS_DATA. * lib/fsusage.c: Remove STAT_STATFS2_FS_DATA case. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_GETMNT. * lib/mountlist.c: Remove MOUNTED_GETMNT case. * lib/getloadavg.c (decstation): Remove definition and case. * m4/getgroups.m4 (AC_FUNC_GETGROUPS): Mention NeXTstep, not Ultrix. * lib/getgroups.c: Likewise. * doc/posix-functions/getgroups.texi: Likewise. * lib/time.in.h: Update comments. 2018-10-16 Bruno Haible <[email protected]> getloadavg: Remove support for ConvexOS. * lib/getloadavg.c: Remove convex case. 2018-10-16 Bruno Haible <[email protected]> getloadavg: Remove support for Sony NEWS. * lib/getloadavg.c: Remove sony_news case. 2018-10-16 Bruno Haible <[email protected]> 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 <[email protected]> fsusage: Remove support for AIX 3. * lib/fsusage.c: Remove code for AIX 3. * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. 2018-10-16 Bruno Haible <[email protected]> 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 <[email protected]> getloadavg: Remove support for HP-UX on m68k. * lib/getloadavg.c: Remove hp9000s300 case. 2018-10-16 Bruno Haible <[email protected]> fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant). * lib/fsusage.c: Remove DOLPHIN case. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. * lib/mountlist.c: Remove MOUNTED_GETMNTTBL case. 2018-10-16 Bruno Haible <[email protected]> getloadavg: Remove support for Alliant FX/2800. * lib/getloadavg.c: Remove alliant case. 2018-10-16 Bruno Haible <[email protected]> getloadavg: Remove support for tek4300. * lib/getloadavg.c: Remove tek4300 case. 2018-10-16 Bruno Haible <[email protected]> getloadavg: Remove support for Ardent. * lib/getloadavg.c: Remove ardent case. 2018-10-16 Bruno Haible <[email protected]> mountlist: Remove support for SVR2. Reported by Andrew Borodin <[email protected]> in <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00101.html>. * lib/mountlist.c: Remove MOUNTED_FREAD case. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_FREAD.
>From 25f7839d4279f026dde0b2a6675704332669ba7c Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 18:44:33 +0200 Subject: [PATCH 01/13] mountlist: Remove support for SVR2. Reported by Andrew Borodin <[email protected]> in <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00101.html>. * lib/mountlist.c: Remove MOUNTED_FREAD case. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_FREAD. --- ChangeLog | 9 +++++++++ lib/mountlist.c | 16 ++-------------- m4/ls-mntd-fs.m4 | 19 +------------------ 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcabc93..610f315 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-10-16 Bruno Haible <[email protected]> + + mountlist: Remove support for SVR2. + Reported by Andrew Borodin <[email protected]> in + <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00101.html>. + * lib/mountlist.c: Remove MOUNTED_FREAD case. + * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define + MOUNTED_FREAD. + 2018-10-15 Paul Eggert <[email protected]> libc-config: merge from glibc diff --git a/lib/mountlist.c b/lib/mountlist.c index 845c348..cd39120 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -97,10 +97,6 @@ # include <dirent.h> #endif -#ifdef MOUNTED_FREAD /* (obsolete) SVR2 */ -# include <mnttab.h> -#endif - #ifdef MOUNTED_FREAD_FSTYP /* (obsolete) SVR3 */ # include <mnttab.h> # include <sys/fstyp.h> @@ -838,7 +834,7 @@ read_file_system_list (bool need_fs_type) } #endif /* MOUNTED_GETFSSTAT */ -#if defined MOUNTED_FREAD || defined MOUNTED_FREAD_FSTYP /* (obsolete) SVR3, SVR2 */ +#if defined MOUNTED_FREAD_FSTYP /* (obsolete) SVR3 */ { struct mnttab mnt; char *table = "/etc/mnttab"; @@ -851,19 +847,12 @@ read_file_system_list (bool need_fs_type) while (fread (&mnt, sizeof mnt, 1, fp) > 0) { me = xmalloc (sizeof *me); -# ifdef GETFSTYP /* SVR3. */ me->me_devname = xstrdup (mnt.mt_dev); -# else - me->me_devname = xmalloc (strlen (mnt.mt_dev) + 6); - strcpy (me->me_devname, "/dev/"); - strcpy (me->me_devname + 5, mnt.mt_dev); -# endif me->me_mountdir = xstrdup (mnt.mt_filsys); me->me_mntroot = NULL; me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_type = ""; me->me_type_malloced = 0; -# ifdef GETFSTYP /* SVR3. */ if (need_fs_type) { struct statfs fsd; @@ -876,7 +865,6 @@ read_file_system_list (bool need_fs_type) me->me_type_malloced = 1; } } -# endif me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); me->me_remote = ME_REMOTE (me->me_devname, me->me_type); @@ -897,7 +885,7 @@ read_file_system_list (bool need_fs_type) if (fclose (fp) == EOF) goto free_then_fail; } -#endif /* MOUNTED_FREAD || MOUNTED_FREAD_FSTYP. */ +#endif /* MOUNTED_FREAD_FSTYP. */ #ifdef MOUNTED_GETMNTTBL /* (obsolete) DolphinOS */ { diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 643d0ce..22abe4d 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,4 +1,4 @@ -# serial 34 +# serial 35 # How to list mounted file systems. # Copyright (C) 1998-2004, 2006, 2009-2018 Free Software Foundation, Inc. @@ -354,23 +354,6 @@ int getmntinfo (struct statfs **, int); fi if test -z "$ac_list_mounted_fs"; then - # (obsolete) SVR2. - AC_CACHE_CHECK([whether it is possible to resort to fread on /etc/mnttab], - [fu_cv_sys_mounted_fread], - [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mnttab.h>]])], - [fu_cv_sys_mounted_fread=yes], - [fu_cv_sys_mounted_fread=no]) - ]) - if test $fu_cv_sys_mounted_fread = yes; then - ac_list_mounted_fs=found - AC_DEFINE([MOUNTED_FREAD], [1], - [Define if there is no specific function for reading the list of - mounted file systems. fread will be used to read /etc/mnttab. - (SVR2) ]) - fi - fi - - if test -z "$ac_list_mounted_fs"; then # Interix / BSD alike statvfs # the code is really interix specific, so make sure, we're on it. case "$host" in -- 2.7.4
>From 917969aae4091de9dbf5595bf1b77f42ccec1298 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 18:47:19 +0200 Subject: [PATCH 02/13] getloadavg: Remove support for Ardent. * lib/getloadavg.c: Remove ardent case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 12 ++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 610f315..f8d6401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Ardent. + * lib/getloadavg.c: Remove ardent case. + +2018-10-16 Bruno Haible <[email protected]> + mountlist: Remove support for SVR2. Reported by Andrew Borodin <[email protected]> in <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00101.html>. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 578316e..ec733a6 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -219,10 +219,6 @@ # define LOAD_AVE_TYPE long # endif -# if defined (ardent) && defined (titan) -# define LOAD_AVE_TYPE long -# endif - # ifdef tek4300 # define LOAD_AVE_TYPE long # endif @@ -278,10 +274,6 @@ # define FSCALE 1000.0 # endif -# if defined (ardent) && defined (titan) -# define FSCALE 65536.0 -# endif - # ifdef tek4300 # define FSCALE 100.0 # endif @@ -315,7 +307,7 @@ # define KERNEL_FILE "/hp-ux" # endif -# if !defined (KERNEL_FILE) && (defined (_SEQUENT_) || defined (MIPS) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (ardent) && defined (titan))) +# if !defined (KERNEL_FILE) && (defined (_SEQUENT_) || defined (MIPS) || defined (SVR4) || defined (ISC) || defined (sgi)) # define KERNEL_FILE "/unix" # endif @@ -324,7 +316,7 @@ # define LDAV_SYMBOL "_Loadavg" # endif -# if !defined (LDAV_SYMBOL) && ((defined (hpux) && !defined (hp9000s300)) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (ardent) && defined (titan)) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) +# if !defined (LDAV_SYMBOL) && ((defined (hpux) && !defined (hp9000s300)) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) # define LDAV_SYMBOL "avenrun" # endif -- 2.7.4
>From b0e7a642ff76df63f04c52c9dffad37da52bb851 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 18:51:00 +0200 Subject: [PATCH 03/13] getloadavg: Remove support for tek4300. * lib/getloadavg.c: Remove tek4300 case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8d6401..59f0d4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for tek4300. + * lib/getloadavg.c: Remove tek4300 case. + +2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Ardent. * lib/getloadavg.c: Remove ardent case. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index ec733a6..30912e9 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -172,13 +172,6 @@ # include <sys/table.h> # endif -/* UTek's /bin/cc on the 4300 has no architecture specific cpp define by - default, but _MACH_IND_SYS_TYPES is defined in <sys/types.h>. Combine - that with a couple of other things and we'll have a unique match. */ -# if !defined (tek4300) && defined (unix) && defined (m68k) && defined (mc68000) && defined (mc68020) && defined (_MACH_IND_SYS_TYPES) -# define tek4300 /* Define by emacs, but not by other users. */ -# endif - /* VAX C can't handle multi-line #ifs, or lines longer than 256 chars. */ # ifndef LOAD_AVE_TYPE @@ -219,10 +212,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef tek4300 -# define LOAD_AVE_TYPE long -# endif - # if defined (alliant) && defined (i860) /* Alliant FX/2800 */ # define LOAD_AVE_TYPE long # endif @@ -274,10 +263,6 @@ # define FSCALE 1000.0 # endif -# ifdef tek4300 -# define FSCALE 100.0 -# endif - # if defined _AIX && !defined HAVE_LIBPERFSTAT # define FSCALE 65536.0 # endif -- 2.7.4
>From 550036fb5afcc1e716a153fe6d0f018826afda09 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 18:53:05 +0200 Subject: [PATCH 04/13] getloadavg: Remove support for Alliant FX/2800. * lib/getloadavg.c: Remove alliant case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59f0d4d..65807d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Alliant FX/2800. + * lib/getloadavg.c: Remove alliant case. + +2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for tek4300. * lib/getloadavg.c: Remove tek4300 case. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 30912e9..c99f663 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -212,10 +212,6 @@ # define LOAD_AVE_TYPE long # endif -# if defined (alliant) && defined (i860) /* Alliant FX/2800 */ -# define LOAD_AVE_TYPE long -# endif - # if defined _AIX && ! defined HAVE_LIBPERFSTAT # define LOAD_AVE_TYPE long # endif @@ -236,13 +232,6 @@ # define FSCALE 1024.0 # endif -# if defined (alliant) && defined (i860) /* Alliant FX/2800 */ -/* <sys/param.h> defines an incorrect value for FSCALE on an - Alliant FX/2800 Concentrix 2.2, according to [email protected]. */ -# undef FSCALE -# define FSCALE 100.0 -# endif - # ifndef FSCALE @@ -297,10 +286,6 @@ # endif -# if !defined (LDAV_SYMBOL) && defined (alliant) -# define LDAV_SYMBOL "_Loadavg" -# endif - # if !defined (LDAV_SYMBOL) && ((defined (hpux) && !defined (hp9000s300)) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) # define LDAV_SYMBOL "avenrun" # endif -- 2.7.4
>From ade7835d185fd4e224dc51d9c0c6e3b1807287d6 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 18:59:25 +0200 Subject: [PATCH 05/13] fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant). * lib/fsusage.c: Remove DOLPHIN case. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. * lib/mountlist.c: Remove MOUNTED_GETMNTTBL case. --- ChangeLog | 7 +++++++ lib/fsusage.c | 5 ++--- lib/mountlist.c | 31 +------------------------------ m4/fsusage.m4 | 4 ++-- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65807d7..f89d9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2018-10-16 Bruno Haible <[email protected]> + fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant). + * lib/fsusage.c: Remove DOLPHIN case. + * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. + * lib/mountlist.c: Remove MOUNTED_GETMNTTBL case. + +2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Alliant FX/2800. * lib/getloadavg.c: Remove alliant case. diff --git a/lib/fsusage.c b/lib/fsusage.c index 6920f85..23cb12a 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -219,10 +219,9 @@ 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, old AIX, \ - Dolphin */ +#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix, old AIX */ -# if !_AIX && !defined _SEQUENT_ && !defined DOLPHIN +# if !_AIX && !defined _SEQUENT_ # define f_bavail f_bfree # endif diff --git a/lib/mountlist.c b/lib/mountlist.c index cd39120..d655d95 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -125,12 +125,6 @@ # include <dirent.h> #endif -#ifdef DOLPHIN -/* So special that it's not worth putting this in autoconf. */ -# undef MOUNTED_FREAD_FSTYP -# define MOUNTED_GETMNTTBL -#endif - #if HAVE_SYS_MNTENT_H /* This is to get MNTOPT_IGNORE on e.g. SVR4. */ # include <sys/mntent.h> @@ -887,29 +881,6 @@ read_file_system_list (bool need_fs_type) } #endif /* MOUNTED_FREAD_FSTYP. */ -#ifdef MOUNTED_GETMNTTBL /* (obsolete) DolphinOS */ - { - struct mntent **mnttbl = getmnttbl (), **ent; - for (ent = mnttbl; *ent; ent++) - { - me = xmalloc (sizeof *me); - me->me_devname = xstrdup ((*ent)->mt_resource); - me->me_mountdir = xstrdup ((*ent)->mt_directory); - me->me_mntroot = NULL; - me->me_type = xstrdup ((*ent)->mt_fstype); - me->me_type_malloced = 1; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ - - /* Add to the linked list. */ - *mtail = me; - mtail = &me->me_next; - } - endmnttbl (); - } -#endif /* MOUNTED_GETMNTTBL */ - #ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */ { struct extmnttab mnt; @@ -953,7 +924,7 @@ read_file_system_list (bool need_fs_type) goto free_then_fail; } } -#endif /* MOUNTED_GETMNTTBL */ +#endif /* MOUNTED_GETEXTMNTENT */ #ifdef MOUNTED_GETMNTENT2 /* Solaris < 8, also (obsolete) SVR4 */ { diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index aab4024..f94f829 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,4 +1,4 @@ -# serial 33 +# serial 34 # Obtaining file system usage information. # Copyright (C) 1997-1998, 2000-2001, 2003-2018 Free Software Foundation, Inc. @@ -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, old AIX, Dolphin)]) + [Define if statfs takes 4 args. (SVR3, Dynix, old Irix, old AIX)]) fi fi -- 2.7.4
>From ead37c92b7a525d68d807f9f7c1fad3f8dc19344 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 20:21:30 +0200 Subject: [PATCH 06/13] getloadavg: Remove support for HP-UX on m68k. * lib/getloadavg.c: Remove hp9000s300 case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f89d9ab..97f6c1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for HP-UX on m68k. + * lib/getloadavg.c: Remove hp9000s300 case. + +2018-10-16 Bruno Haible <[email protected]> + fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant). * lib/fsusage.c: Remove DOLPHIN case. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index c99f663..943a826 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -286,7 +286,7 @@ # endif -# if !defined (LDAV_SYMBOL) && ((defined (hpux) && !defined (hp9000s300)) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) +# if !defined (LDAV_SYMBOL) && (defined (hpux) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (_AIX) && !defined(HAVE_LIBPERFSTAT))) # define LDAV_SYMBOL "avenrun" # endif -- 2.7.4
>From 8b93fddaac5543c03b40ea0887127939be99e8a5 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> 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 <[email protected]> + 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 <[email protected]> + 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 <sys/statfs.h> # endif -# if HAVE_DUSTAT_H /* AIX PS/2 */ -# include <sys/dustat.h> -# 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
>From b51f781506dc73f5e74705f542bf6fd2c60b84fc Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 20:47:03 +0200 Subject: [PATCH 08/13] fsusage: Remove support for AIX 3. * lib/fsusage.c: Remove code for AIX 3. * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. --- ChangeLog | 6 ++++++ lib/fsusage.c | 6 +++--- m4/fsusage.m4 | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21127ec..6411e72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2018-10-16 Bruno Haible <[email protected]> + fsusage: Remove support for AIX 3. + * lib/fsusage.c: Remove code for AIX 3. + * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. + +2018-10-16 Bruno Haible <[email protected]> + 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. diff --git a/lib/fsusage.c b/lib/fsusage.c index 8431f20..2a69022 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -216,9 +216,9 @@ 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, old AIX */ +#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix */ -# if !_AIX && !defined _SEQUENT_ +# if !defined _SEQUENT_ # define f_bavail f_bfree # endif @@ -230,7 +230,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) /* Empirically, the block counts on most SVR3 and SVR3-derived systems seem to always be in terms of 512-byte blocks, no matter what value f_bsize has. */ -# if _AIX || defined _CRAY +# if defined _CRAY fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); # else fsp->fsu_blocksize = 512; diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index 6f6e9cd..56ac473 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -206,7 +206,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; if test $ac_fsusage_space = no; then # SVR3 # (Solaris already handled above.) - AC_CACHE_CHECK([for four-argument statfs (AIX-3.2.5, SVR3)], + AC_CACHE_CHECK([for four-argument statfs (SVR3)], [fu_cv_sys_stat_statfs4], [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <sys/types.h> @@ -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, old AIX)]) + [Define if statfs takes 4 args. (SVR3, Dynix, old Irix)]) fi fi -- 2.7.4
>From 43a8882ec0a98e43c78e7d2612fb133f10bb2810 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> 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 <[email protected]> + 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 <[email protected]> + 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. -@item 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 <mntent.h> # include <sys/types.h> # 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
>From 87644cac39705555749005e6ba2e4bcc16e4a46e Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 21:05:02 +0200 Subject: [PATCH 10/13] getloadavg: Remove support for Sony NEWS. * lib/getloadavg.c: Remove sony_news case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10a9914..d295c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Sony NEWS. + * lib/getloadavg.c: Remove sony_news case. + +2018-10-16 Bruno Haible <[email protected]> + fsusage, mountlist, getloadavg: Remove support for Dynix/ptx. * lib/fsusage.c: Remove _SEQUENT_ case. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 0532e1b..ceff736 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -62,7 +62,6 @@ __MSDOS__ No-op for MSDOS. NeXT sgi - sony_news NEWS-OS (works at least for 4.1C) UMAX UMAX4_3 VMS @@ -194,10 +193,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef sony_news -# define LOAD_AVE_TYPE long -# endif - # ifdef OSF_ALPHA # define LOAD_AVE_TYPE long # endif -- 2.7.4
>From ef1430d26562bbb680c0a1c1e1b1ba9a2b62f7c0 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 21:09:51 +0200 Subject: [PATCH 11/13] getloadavg: Remove support for ConvexOS. * lib/getloadavg.c: Remove convex case. --- ChangeLog | 5 +++++ lib/getloadavg.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d295c63..39164d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for ConvexOS. + * lib/getloadavg.c: Remove convex case. + +2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for Sony NEWS. * lib/getloadavg.c: Remove sony_news case. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index ceff736..a1ab342 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -55,7 +55,6 @@ apollo BSD Real BSD, not just BSD-like. - convex DGUX eunice UNIX emulator under VMS. hpux @@ -201,13 +200,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef convex -# define LOAD_AVE_TYPE double -# ifndef LDAV_CVT -# define LDAV_CVT(n) (n) -# endif -# endif - # endif /* No LOAD_AVE_TYPE. */ # ifdef OSF_ALPHA -- 2.7.4
>From b0f00eeed03a65c361312cfc6a507c8be42971a9 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 21:25:00 +0200 Subject: [PATCH 12/13] fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define STAT_STATFS2_FS_DATA. * lib/fsusage.c: Remove STAT_STATFS2_FS_DATA case. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_GETMNT. * lib/mountlist.c: Remove MOUNTED_GETMNT case. * lib/getloadavg.c (decstation): Remove definition and case. * m4/getgroups.m4 (AC_FUNC_GETGROUPS): Mention NeXTstep, not Ultrix. * lib/getgroups.c: Likewise. * doc/posix-functions/getgroups.texi: Likewise. * lib/time.in.h: Update comments. --- ChangeLog | 15 +++++++++++++++ doc/posix-functions/getgroups.texi | 2 +- lib/fsusage.c | 15 --------------- lib/getgroups.c | 4 ++-- lib/getloadavg.c | 15 +-------------- lib/mountlist.c | 34 ---------------------------------- lib/time.in.h | 2 +- m4/fsusage.m4 | 35 ----------------------------------- m4/getgroups.m4 | 4 ++-- m4/ls-mntd-fs.m4 | 18 ------------------ 10 files changed, 22 insertions(+), 122 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39164d9..5c8babf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2018-10-16 Bruno Haible <[email protected]> + fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix. + * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define + STAT_STATFS2_FS_DATA. + * lib/fsusage.c: Remove STAT_STATFS2_FS_DATA case. + * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define + MOUNTED_GETMNT. + * lib/mountlist.c: Remove MOUNTED_GETMNT case. + * lib/getloadavg.c (decstation): Remove definition and case. + * m4/getgroups.m4 (AC_FUNC_GETGROUPS): Mention NeXTstep, not Ultrix. + * lib/getgroups.c: Likewise. + * doc/posix-functions/getgroups.texi: Likewise. + * lib/time.in.h: Update comments. + +2018-10-16 Bruno Haible <[email protected]> + getloadavg: Remove support for ConvexOS. * lib/getloadavg.c: Remove convex case. diff --git a/doc/posix-functions/getgroups.texi b/doc/posix-functions/getgroups.texi index e363227..221f894 100644 --- a/doc/posix-functions/getgroups.texi +++ b/doc/posix-functions/getgroups.texi @@ -16,7 +16,7 @@ On some platforms, this function fails to reject a negative count, even though that is less than the size that would be returned: FreeBSD 7.2. @item -On Ultrix 4.3, @code{getgroups (0, NULL)} always fails. See macro +On NeXTstep 3.2, @code{getgroups (0, NULL)} always fails. See macro @samp{AC_FUNC_GETGROUPS}. @item On very old systems, this function operated on an array of @samp{int}, diff --git a/lib/fsusage.c b/lib/fsusage.c index e33152a..17daf91 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -148,21 +148,6 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) ? PROPAGATE_ALL_ONES (fsd.f_frsize) : PROPAGATE_ALL_ONES (fsd.f_bsize)); -#elif defined STAT_STATFS2_FS_DATA /* Ultrix */ - - struct fs_data fsd; - - if (statfs (file, &fsd) != 1) - return -1; - - fsp->fsu_blocksize = 1024; - fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot); - fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree); - fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen); - fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0; - fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot); - fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree); - #elif defined STAT_STATFS3_OSF1 /* OSF/1 */ struct statfs fsd; diff --git a/lib/getgroups.c b/lib/getgroups.c index ec137c1..cd6f4d7 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -58,8 +58,8 @@ int posix_getgroups (int, gid_t []) __asm ("_getgroups"); # define getgroups posix_getgroups # endif -/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always - fails. On other systems, it returns the number of supplemental +/* On at least NeXTstep 3.2, getgroups (0, NULL) always fails. + On other systems, it returns the number of supplemental groups for the process. This function handles that special case and lets the system-provided function handle all others. However, it can fail with ENOMEM if memory is tight. It is unspecified diff --git a/lib/getloadavg.c b/lib/getloadavg.c index a1ab342..4e7eb0d 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -97,11 +97,6 @@ # define WINDOWS32 # endif -# if !defined (BSD) && defined (ultrix) -/* Ultrix behaves like BSD on Vaxen. */ -# define BSD -# endif - # ifdef NeXT /* NeXT in the 2.{0,1,2} releases defines BSD in <sys/param.h>, which conflicts with the definition understood in this file, that this @@ -141,10 +136,6 @@ # define MORE_BSD # endif -# if defined (ultrix) && defined (mips) -# define decstation -# endif - # if defined (__SVR4) && !defined (SVR4) # define SVR4 # endif @@ -180,10 +171,6 @@ # define LOAD_AVE_TYPE long # endif -# ifdef decstation -# define LOAD_AVE_TYPE long -# endif - # ifdef sgi # define LOAD_AVE_TYPE long # endif @@ -218,7 +205,7 @@ # define FSCALE 2048.0 # endif -# if defined (MIPS) || defined (SVR4) || defined (decstation) +# if defined (MIPS) || defined (SVR4) # define FSCALE 256 # endif diff --git a/lib/mountlist.c b/lib/mountlist.c index 01ad309..9a94f42 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -84,11 +84,6 @@ # include <sys/statvfs.h> #endif -#ifdef MOUNTED_GETMNT /* (obsolete) Ultrix */ -# include <sys/mount.h> -# include <sys/fs_types.h> -#endif - #ifdef MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ # include <fs_info.h> # include <dirent.h> @@ -647,35 +642,6 @@ read_file_system_list (bool need_fs_type) } #endif /* MOUNTED_GETMNTINFO2 */ -#ifdef MOUNTED_GETMNT /* (obsolete) Ultrix */ - { - int offset = 0; - int val; - struct fs_data fsd; - - while (errno = 0, - 0 < (val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, - (char *) 0))) - { - me = xmalloc (sizeof *me); - me->me_devname = xstrdup (fsd.fd_req.devname); - me->me_mountdir = xstrdup (fsd.fd_req.path); - me->me_mntroot = NULL; - me->me_type = gt_names[fsd.fd_req.fstype]; - me->me_type_malloced = 0; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = fsd.fd_req.dev; - - /* Add to the linked list. */ - *mtail = me; - mtail = &me->me_next; - } - if (val < 0) - goto free_then_fail; - } -#endif /* MOUNTED_GETMNT. */ - #if defined MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ { /* The next_dev() and fs_stat_dev() system calls give the list of diff --git a/lib/time.in.h b/lib/time.in.h index 44ba9bc..feb1d6c 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -48,7 +48,7 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). +/* Some systems don't define struct timespec (e.g., AIX 4.1). Or they define it with the wrong member names or define it in <sys/time.h> (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, but the pthreads-win32 library defines it in <pthread.h>. */ diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index 96378ba..c3ba439 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -263,41 +263,6 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; fi fi - if test $ac_fsusage_space = no; then - # Ultrix - AC_CACHE_CHECK([for two-argument statfs with struct fs_data (Ultrix)], - [fu_cv_sys_stat_fs_data], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif -#ifdef HAVE_SYS_FS_TYPES_H -#include <sys/fs_types.h> -#endif - int - main () - { - struct fs_data fsd; - /* Ultrix's statfs returns 1 for success, - 0 for not mounted, -1 for failure. */ - return statfs (".", &fsd) != 1; - }]])], - [fu_cv_sys_stat_fs_data=yes], - [fu_cv_sys_stat_fs_data=no], - [fu_cv_sys_stat_fs_data=no]) - ]) - if test $fu_cv_sys_stat_fs_data = yes; then - ac_fsusage_space=yes - AC_DEFINE([STAT_STATFS2_FS_DATA], [1], - [Define if statfs takes 2 args and the second argument has - type struct fs_data. (Ultrix)]) - fi - fi - AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) ]) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index d382402..8cddb6c 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. @@ -34,7 +34,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT], - [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + [[/* On NeXTstep 3.2, getgroups (0, 0) always fails. */ return getgroups (0, 0) == -1;]]) ], [ac_cv_func_getgroups_works=yes], diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 64a2dfc..7a4efcc 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -311,24 +311,6 @@ int getmntinfo (struct statfs **, int); fi if test -z "$ac_list_mounted_fs"; then - # (obsolete) Ultrix. - AC_CACHE_CHECK([for getmnt function], - [fu_cv_sys_mounted_getmnt], - [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ -#include <sys/fs_types.h> -#include <sys/mount.h>]])], - [fu_cv_sys_mounted_getmnt=yes], - [fu_cv_sys_mounted_getmnt=no]) - ]) - if test $fu_cv_sys_mounted_getmnt = yes; then - ac_list_mounted_fs=found - AC_DEFINE([MOUNTED_GETMNT], [1], - [Define if there is a function named getmnt for reading the list of - mounted file systems. (Ultrix)]) - fi - fi - - if test -z "$ac_list_mounted_fs"; then # Haiku, also (obsolete) BeOS. AC_CHECK_FUNCS([next_dev fs_stat_dev]) AC_CHECK_HEADERS([fs_info.h]) -- 2.7.4
>From 130271eff43baa4c701417fe3816244ebdb0e86a Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 16 Oct 2018 21:27:45 +0200 Subject: [PATCH 13/13] mountlist: Remove support for Cray with UNICOS 9. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define MOUNTED_LISTMNTENT. * lib/mountlist.c: Remove MOUNTED_LISTMNTENT case. --- ChangeLog | 7 +++++++ lib/mountlist.c | 35 ----------------------------------- m4/ls-mntd-fs.m4 | 30 ------------------------------ 3 files changed, 7 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c8babf..9843d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2018-10-16 Bruno Haible <[email protected]> + mountlist: Remove support for Cray with UNICOS 9. + * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define + MOUNTED_LISTMNTENT. + * lib/mountlist.c: Remove MOUNTED_LISTMNTENT case. + +2018-10-16 Bruno Haible <[email protected]> + fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix. * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define STAT_STATFS2_FS_DATA. diff --git a/lib/mountlist.c b/lib/mountlist.c index 9a94f42..bc86c18 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -95,10 +95,6 @@ # include <sys/statfs.h> #endif -#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */ -# include <mntent.h> -#endif - #ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */ # include <sys/mnttab.h> #endif @@ -423,37 +419,6 @@ read_file_system_list (bool need_fs_type) struct mount_entry **mtail = &mount_list; (void) need_fs_type; -#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */ - { - struct tabmntent *mntlist, *p; - struct mntent *mnt; - - /* the third and fourth arguments could be used to filter mounts, - but Crays doesn't seem to have any mounts that we want to - remove. Specifically, automount create normal NFS mounts. - */ - - if (listmntent (&mntlist, KMTAB, NULL, NULL) < 0) - return NULL; - for (p = mntlist; p; p = p->next) - { - mnt = p->ment; - me = xmalloc (sizeof *me); - me->me_devname = xstrdup (mnt->mnt_fsname); - me->me_mountdir = xstrdup (mnt->mnt_dir); - me->me_mntroot = NULL; - me->me_type = xstrdup (mnt->mnt_type); - me->me_type_malloced = 1; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = -1; - *mtail = me; - mtail = &me->me_next; - } - freemntlist (mntlist); - } -#endif - #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS */ { diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 7a4efcc..8ce748c 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -68,36 +68,6 @@ $ac_includes_default # make sure LIBS contains the appropriate -l option. AC_FUNC_GETMNTENT - # This test must precede the ones for getmntent because Unicos-9 is - # reported to have the getmntent function, but its support is incompatible - # with other getmntent implementations. - - # NOTE: Normally, I wouldn't use a check for system type as I've done for - # 'CRAY' below since that goes against the whole autoconf philosophy. But - # I think there is too great a chance that some non-Cray system has a - # function named listmntent to risk the false positive. - - if test -z "$ac_list_mounted_fs"; then - # (obsolete) Cray UNICOS 9 - AC_CACHE_CHECK([for listmntent of Cray/Unicos-9], - [fu_cv_sys_mounted_cray_listmntent], - [fu_cv_sys_mounted_cray_listmntent=no - AC_EGREP_CPP([yes], - [#ifdef _CRAY -yes -#endif - ], [test $ac_cv_func_listmntent = yes \ - && fu_cv_sys_mounted_cray_listmntent=yes] - ) - ]) - if test $fu_cv_sys_mounted_cray_listmntent = yes; then - ac_list_mounted_fs=found - AC_DEFINE([MOUNTED_LISTMNTENT], [1], - [Define if there is a function named listmntent that can be used to - list all mounted file systems. (UNICOS)]) - fi - fi - if test -z "$ac_list_mounted_fs"; then # AIX. AC_CACHE_CHECK([for mntctl function and struct vmount], -- 2.7.4
